labelService getUriLabel noPrefix option

isidorn · isidorn · commit e0f506eac8e7 · 2018-09-18T17:00:26.000+02:00
fixes microsoft#58504
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
@@ -26,7 +26,12 @@ export interface RegisterFormatterEvent {
 
 export interface ILabelService {
 	_serviceBrand: any;
-	getUriLabel(resource: URI, options?: { relative?: boolean, forceNoTildify?: boolean }): string;
+	/**
+	 * Gets the human readable label for a uri.
+	 * If relative is passed returns a label relative to the workspace root that the uri belongs to.
+	 * If noPrefix is passed does not tildify the label and also does not prepand the root name for relative labels in a multi root scenario.
+	 */
+	getUriLabel(resource: URI, options?: { relative?: boolean, noPrefix?: boolean }): string;
 	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWorkspace), options?: { verbose: boolean }): string;
 	registerFormatter(schema: string, formatter: LabelRules): IDisposable;
 	onDidRegisterFormatter: Event<RegisterFormatterEvent>;
@@ -67,7 +72,7 @@ export class LabelService implements ILabelService {
 		return this._onDidRegisterFormatter.event;
 	}
 
-	getUriLabel(resource: URI, options: { relative?: boolean, forceNoTildify?: boolean } = {}): string {
+	getUriLabel(resource: URI, options: { relative?: boolean, noPrefix?: boolean } = {}): string {
 		if (!resource) {
 			return undefined;
 		}
@@ -83,12 +88,12 @@ export class LabelService implements ILabelService {
 				if (isEqual(baseResource.uri, resource, !isLinux)) {
 					relativeLabel = ''; // no label if resources are identical
 				} else {
-					const baseResourceLabel = this.formatUri(baseResource.uri, formatter, options.forceNoTildify);
-					relativeLabel = ltrim(this.formatUri(resource, formatter, options.forceNoTildify).substring(baseResourceLabel.length), formatter.uri.separator);
+					const baseResourceLabel = this.formatUri(baseResource.uri, formatter, options.noPrefix);
+					relativeLabel = ltrim(this.formatUri(resource, formatter, options.noPrefix).substring(baseResourceLabel.length), formatter.uri.separator);
 				}
 
 				const hasMultipleRoots = this.contextService.getWorkspace().folders.length > 1;
-				if (hasMultipleRoots) {
+				if (hasMultipleRoots && !options.noPrefix) {
 					const rootName = (baseResource && baseResource.name) ? baseResource.name : basenameOrAuthority(baseResource.uri);
 					relativeLabel = relativeLabel ? (rootName + ' • ' + relativeLabel) : rootName; // always show root basename if there are multiple
 				}
@@ -97,7 +102,7 @@ export class LabelService implements ILabelService {
 			}
 		}
 
-		return this.formatUri(resource, formatter, options.forceNoTildify);
+		return this.formatUri(resource, formatter, options.noPrefix);
 	}
 
 	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWorkspace), options?: { verbose: boolean }): string {
diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -392,7 +392,7 @@ function resourcesToClipboard(resources: URI[], relative: boolean, clipboardServ
 	if (resources.length) {
 		const lineDelimiter = isWindows ? '\r\n' : '\n';
 
-		const text = resources.map(resource => labelService.getUriLabel(resource, { relative, forceNoTildify: true }))
+		const text = resources.map(resource => labelService.getUriLabel(resource, { relative, noPrefix: true }))
 			.join(lineDelimiter);
 		clipboardService.writeText(text);
 	} else {
