Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 (#5607)

This commit is contained in:
Anthony Dresser
2019-05-24 12:20:30 -07:00
committed by GitHub
parent 361ada4963
commit bcc449b524
126 changed files with 3096 additions and 2255 deletions

View File

@@ -71,9 +71,9 @@ export class IntegrityServiceImpl implements IIntegrityService {
this.isPure().then(r => {
if (r.isPure) {
// all is good
return;
return; // all is good
}
this._prompt();
});
}
@@ -106,29 +106,25 @@ export class IntegrityServiceImpl implements IIntegrityService {
return this._isPurePromise;
}
private _isPure(): Promise<IntegrityTestResult> {
private async _isPure(): Promise<IntegrityTestResult> {
const expectedChecksums = product.checksums || {};
return this.lifecycleService.when(LifecyclePhase.Eventually).then(() => {
let asyncResults: Promise<ChecksumPair>[] = Object.keys(expectedChecksums).map((filename) => {
return this._resolve(filename, expectedChecksums[filename]);
});
await this.lifecycleService.when(LifecyclePhase.Eventually);
return Promise.all(asyncResults).then<IntegrityTestResult>((allResults) => {
let isPure = true;
for (let i = 0, len = allResults.length; i < len; i++) {
if (!allResults[i].isPure) {
isPure = false;
break;
}
}
const allResults = await Promise.all(Object.keys(expectedChecksums).map(filename => this._resolve(filename, expectedChecksums[filename])));
return {
isPure: isPure,
proof: allResults
};
});
});
let isPure = true;
for (let i = 0, len = allResults.length; i < len; i++) {
if (!allResults[i].isPure) {
isPure = false;
break;
}
}
return {
isPure: isPure,
proof: allResults
};
}
private _resolve(filename: string, expected: string): Promise<ChecksumPair> {