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

@@ -30,7 +30,7 @@ class TestTelemetryAppender implements ITelemetryAppender {
return this.events.length;
}
public dispose(): Promise<any> {
public flush(): Promise<any> {
this.isDisposed = true;
return Promise.resolve(null);
}