file workspace suffix is empty string

isidorn · isidorn · commit af2e59cbe2df · 2018-08-29T16:48:06.000+02:00
fixes microsoft#57489
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
@@ -107,7 +107,8 @@ export class LabelService implements ILabelService {
 			// Folder on disk
 			const formatter = this.formatters.get(workspace.scheme);
 			const label = options && options.verbose ? this.getUriLabel(workspace) : basenameOrAuthority(workspace);
-			return formatter && formatter.workspace && formatter.workspace.suffix ? `${label} (${formatter.workspace.suffix})` : label;
+			const suffix = formatter && formatter.workspace && (typeof formatter.workspace.suffix === 'string') ? formatter.workspace.suffix : workspace.scheme;
+			return suffix ? `${label} (${suffix})` : label;
 		}
 
 		// Workspace: Untitled
diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -62,6 +62,9 @@ class FileUriLabelContribution implements IWorkbenchContribution {
 				separator: nativeSep,
 				tildify: !platform.isWindows,
 				normalizeDriveLetter: platform.isWindows
+			},
+			workspace: {
+				suffix: ''
 			}
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ export class LabelService implements ILabelService {`
`107`	`107`	`// Folder on disk`
`108`	`108`	`const formatter = this.formatters.get(workspace.scheme);`
`109`	`109`	`const label = options && options.verbose ? this.getUriLabel(workspace) : basenameOrAuthority(workspace);`
`110`		- return formatter && formatter.workspace && formatter.workspace.suffix ? `${label} (${formatter.workspace.suffix})` : label;
	`110`	`+ const suffix = formatter && formatter.workspace && (typeof formatter.workspace.suffix === 'string') ? formatter.workspace.suffix : workspace.scheme;`
	`111`	+ return suffix ? `${label} (${suffix})` : label;
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`// Workspace: Untitled`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ class FileUriLabelContribution implements IWorkbenchContribution {`
`62`	`62`	`separator: nativeSep,`
`63`	`63`	`tildify: !platform.isWindows,`
`64`	`64`	`normalizeDriveLetter: platform.isWindows`
	`65`	`+ },`
	`66`	`+ workspace: {`
	`67`	`+ suffix: ''`
`65`	`68`	`}`
`66`	`69`	`});`
`67`	`70`	`}`