Merge from vscode 8aa90d444f5d051984e8055f547c4252d53479b3 (#5587)

* Merge from vscode 8aa90d444f5d051984e8055f547c4252d53479b3

* pipeline errors

* fix build
This commit is contained in:
Anthony Dresser
2019-05-23 11:16:03 -07:00
committed by GitHub
parent ca36f20c6b
commit cf8f8907ee
141 changed files with 6450 additions and 1228 deletions

View File

@@ -248,7 +248,7 @@ class EditorModelManager extends Disposable {
super.dispose();
}
public esureSyncedResources(resources: URI[]): void {
public ensureSyncedResources(resources: URI[]): void {
for (const resource of resources) {
let resourceStr = resource.toString();
@@ -387,7 +387,7 @@ export class EditorWorkerClient extends Disposable {
protected _withSyncedResources(resources: URI[]): Promise<EditorSimpleWorkerImpl> {
return this._getProxy().then((proxy) => {
this._getOrCreateModelManager(proxy).esureSyncedResources(resources);
this._getOrCreateModelManager(proxy).ensureSyncedResources(resources);
return proxy;
});
}