Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Progress API percentage is ambiguous (fixes #46743)

Browse Source
This commit is contained in:
Benjamin Pasero
2018-03-28 09:44:06 +02:00
parent 95b0cffe72
commit 19001175dd
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/node/extHostProgress.ts
View File

@@ -70,10 +70,10 @@ export class ExtHostProgress implements ExtHostProgressShape {
function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
result.message = currentValue.message;
if (typeof currentValue.percentage === 'number' && typeof result.message === 'number') {
result.percentage += currentValue.percentage;
} else if (typeof currentValue.percentage === 'number') {
result.percentage = currentValue.percentage;
if (typeof currentValue.increment === 'number' && typeof result.message === 'number') {
result.increment += currentValue.increment;
} else if (typeof currentValue.increment === 'number') {
result.increment = currentValue.increment;
}
return result;
}