Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3 (#6516)

* Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3

* fix tests
This commit is contained in:
Anthony Dresser
2019-07-28 15:15:24 -07:00
committed by GitHub
parent aacf1e7f1c
commit 1d56a17f32
292 changed files with 19784 additions and 1873 deletions

View File

@@ -10,7 +10,6 @@ import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService
import { append, $, hide } from 'vs/base/browser/dom';
import { TestStorageService, TestLayoutService } from 'vs/workbench/test/workbenchTestServices';
import { StorageScope } from 'vs/platform/storage/common/storage';
import { Orientation } from 'vs/base/browser/ui/grid/grid';
class SimplePart extends Part {
@@ -19,7 +18,7 @@ class SimplePart extends Part {
minimumHeight: number;
maximumHeight: number;
layout(width: number, height: number, orientation: Orientation): void {
layout(width: number, height: number): void {
throw new Error('Method not implemented.');
}
@@ -172,4 +171,4 @@ suite('Workbench parts', () => {
assert(!document.getElementById('myPart.title'));
assert(document.getElementById('myPart.content'));
});
});
});