From 72913b1adc6cd1622d82d1fa7d8953f0a84ea6b1 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 4 Jun 2018 14:59:32 +0200
Subject: [PATCH] fix #51074

---
 .../progress/browser/progressService2.ts      | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index b0ef1590ae5..5a090430915 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -141,25 +141,32 @@ export class ProgressService2 implements IProgressService2 {
 		} else {
 			const [options, progress] = this._stack[idx];
 
-			let text = options.title;
-			if (progress.value && progress.value.message) {
-				text = progress.value.message;
-			}
+			let progressTitle = options.title;
+			let progressMessage = progress.value && progress.value.message;
+			let text: string;
+			let title: string;
+
+			if (progressTitle && progressMessage) {
+				// <title>: <message>
+				text = localize('progress.text2', "{0}: {1}", progressTitle, progressMessage);
+				title = options.source ? localize('progress.title3', "[{0}] {1}: {2}", options.source, progressTitle, progressMessage) : text;
+
+			} else if (progressTitle) {
+				// <title>
+				text = progressTitle;
+				title = options.source ? localize('progress.title2', "[{0}]: {1}", options.source, progressTitle) : text;
+
+			} else if (progressMessage) {
+				// <message>
+				text = progressMessage;
+				title = options.source ? localize('progress.title2', "[{0}]: {1}", options.source, progressMessage) : text;
 
-			if (!text) {
-				// no message -> no progress. try with next on stack
+			} else {
+				// no title, no message -> no progress. try with next on stack
 				this._updateWindowProgress(idx + 1);
 				return;
 			}
 
-			let title = text;
-			if (options.title && options.title !== title) {
-				title = localize('progress.subtitle', "{0} - {1}", options.title, title);
-			}
-			if (options.source) {
-				title = localize('progress.title', "{0}: {1}", options.source, title);
-			}
-
 			WindowProgressItem.Instance.text = text;
 			WindowProgressItem.Instance.title = title;
 			WindowProgressItem.Instance.show();
-- 
GitLab