Merge VS Code 1.23.1 (#1520)

This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions

View File

@@ -56,7 +56,7 @@ suite('Workbench - TextModelResolverService', () => {
accessor.untitledEditorService.revertAll();
});
test('resolve resource', function (done) {
test('resolve resource', function () {
const dispose = accessor.textModelResolverService.registerTextModelContentProvider('test', {
provideTextContent: function (resource: URI): TPromise<ITextModel> {
if (resource.scheme === 'test') {
@@ -72,7 +72,7 @@ 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 => {
return input.resolve().then(model => {
assert.ok(model);
assert.equal(snapshotToString((model as ResourceEditorModel).createSnapshot()), 'Hello Test');
@@ -85,7 +85,6 @@ suite('Workbench - TextModelResolverService', () => {
assert.equal(disposed, true);
dispose.dispose();
done();
});
});