mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-18 03:21:36 -04:00
Initial VS Code 1.19 source merge (#571)
* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
This commit is contained in:
@@ -49,6 +49,8 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
|
||||
} else {
|
||||
model.dispose();
|
||||
}
|
||||
}, err => {
|
||||
// ignore
|
||||
});
|
||||
}
|
||||
|
||||
@@ -102,7 +104,6 @@ export class TextModelResolverService implements ITextModelService {
|
||||
private resourceModelCollection: ResourceModelCollection;
|
||||
|
||||
constructor(
|
||||
@ITextFileService private textFileService: ITextFileService,
|
||||
@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
|
||||
@IInstantiationService private instantiationService: IInstantiationService,
|
||||
@IModelService private modelService: IModelService
|
||||
|
||||
@@ -71,9 +71,9 @@ suite('Workbench - TextModelResolverService', () => {
|
||||
let resource = URI.from({ scheme: 'test', authority: null, path: 'thePath' });
|
||||
let input: ResourceEditorInput = instantiationService.createInstance(ResourceEditorInput, 'The Name', 'The Description', resource);
|
||||
|
||||
input.resolve().then((model: ResourceEditorModel) => {
|
||||
input.resolve().then(model => {
|
||||
assert.ok(model);
|
||||
assert.equal(model.getValue(), 'Hello Test');
|
||||
assert.equal((model as ResourceEditorModel).getValue(), 'Hello Test');
|
||||
|
||||
let disposed = false;
|
||||
once(model.onDispose)(() => {
|
||||
|
||||
Reference in New Issue
Block a user