Merge master.

This commit is contained in:
Joel Day
2017-01-17 13:18:41 -08:00
1054 changed files with 143505 additions and 108018 deletions

View File

@@ -315,7 +315,7 @@ suite('window namespace tests', () => {
assert.equal(terminal.name, 'foo');
assert.throws(() => {
terminal.name = 'bar';
(<any>terminal).name = 'bar';
}, 'Terminal.name should be readonly');
});

View File

@@ -24,7 +24,7 @@ suite('workspace-namespace', () => {
assert.equal(config['config0'], true);
assert.equal(config['config4'], '');
assert.throws(() => config['config4'] = 'valuevalue');
assert.throws(() => (<any>config)['config4'] = 'valuevalue');
assert.ok(config.has('nested.config1'));
assert.equal(config.get('nested.config1'), 42);