better fix for #54295 & #54369

2026-04-25 11:08:51 +01:00 · 2018-07-16 11:35:48 +02:00
parent b757388b47
commit fafff47907
2 changed files with 13 additions and 5 deletions
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -72,7 +72,11 @@ export class ExtHostProgress implements ExtHostProgressShape {
 function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
 	result.message = currentValue.message;
 	if (typeof currentValue.increment === 'number') {
-		result.increment = currentValue.increment;
+		if (typeof result.increment === 'number') {
+			result.increment += currentValue.increment;
+		} else {
+			result.increment = currentValue.increment;
+		}
 	}

 	return result;