untitled - prevent slash as description only

Benjamin Pasero · Benjamin Pasero · commit 9c31bce0c77f · 2020-02-21T12:20:10.000+01:00
diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts
@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
-import * as resources from 'vs/base/common/resources';
+import { posix } from 'vs/base/common/path';
+import { dirname, isEqual, basenameOrAuthority } from 'vs/base/common/resources';
 import { IconLabel, IIconLabelValueOptions, IIconLabelCreationOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IModeService } from 'vs/editor/common/services/modeService';
@@ -323,7 +324,7 @@ class ResourceLabelWidget extends IconLabel {
 	}
 
 	notifyUntitledLabelChange(resource: URI): void {
-		if (resources.isEqual(resource, this.label?.resource)) {
+		if (isEqual(resource, this.label?.resource)) {
 			this.render(false);
 		}
 	}
@@ -340,13 +341,13 @@ class ResourceLabelWidget extends IconLabel {
 			}
 
 			if (!name) {
-				name = resources.basenameOrAuthority(resource);
+				name = basenameOrAuthority(resource);
 			}
 		}
 
 		let description: string | undefined;
 		if (!options?.hidePath) {
-			description = this.labelService.getUriLabel(resources.dirname(resource), { relative: true });
+			description = this.labelService.getUriLabel(dirname(resource), { relative: true });
 		}
 
 		this.setResource({ resource, name, description }, options);
@@ -370,13 +371,15 @@ class ResourceLabelWidget extends IconLabel {
 				if (typeof label.description === 'string') {
 					let untitledDescription: string;
 					if (untitledModel.hasAssociatedFilePath) {
-						untitledDescription = this.labelService.getUriLabel(resources.dirname(untitledModel.resource), { relative: true });
+						untitledDescription = this.labelService.getUriLabel(dirname(untitledModel.resource), { relative: true });
 					} else {
 						untitledDescription = untitledModel.resource.path;
 					}
 
 					if (label.name !== untitledDescription) {
 						label.description = untitledDescription;
+					} else if (label.description === posix.sep) {
+						label.description = undefined; // unset showing just "/" for untitled without associated resource
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`--------------------------------------------------------------------------------------------/`
`5`	`5`
`6`	`6`	`import { URI } from 'vs/base/common/uri';`
`7`		`-import * as resources from 'vs/base/common/resources';`
	`7`	`+import { posix } from 'vs/base/common/path';`
	`8`	`+import { dirname, isEqual, basenameOrAuthority } from 'vs/base/common/resources';`
`8`	`9`	`import { IconLabel, IIconLabelValueOptions, IIconLabelCreationOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';`
`9`	`10`	`import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';`
`10`	`11`	`import { IModeService } from 'vs/editor/common/services/modeService';`
`@@ -323,7 +324,7 @@ class ResourceLabelWidget extends IconLabel {`
`323`	`324`	`}`
`324`	`325`
`325`	`326`	`notifyUntitledLabelChange(resource: URI): void {`
`326`		`- if (resources.isEqual(resource, this.label?.resource)) {`
	`327`	`+ if (isEqual(resource, this.label?.resource)) {`
`327`	`328`	`this.render(false);`
`328`	`329`	`}`
`329`	`330`	`}`
`@@ -340,13 +341,13 @@ class ResourceLabelWidget extends IconLabel {`
`340`	`341`	`}`
`341`	`342`
`342`	`343`	`if (!name) {`
`343`		`- name = resources.basenameOrAuthority(resource);`
	`344`	`+ name = basenameOrAuthority(resource);`
`344`	`345`	`}`
`345`	`346`	`}`
`346`	`347`
`347`	`348`	`let description: string \| undefined;`
`348`	`349`	`if (!options?.hidePath) {`
`349`		`- description = this.labelService.getUriLabel(resources.dirname(resource), { relative: true });`
	`350`	`+ description = this.labelService.getUriLabel(dirname(resource), { relative: true });`
`350`	`351`	`}`
`351`	`352`
`352`	`353`	`this.setResource({ resource, name, description }, options);`
`@@ -370,13 +371,15 @@ class ResourceLabelWidget extends IconLabel {`
`370`	`371`	`if (typeof label.description === 'string') {`
`371`	`372`	`let untitledDescription: string;`
`372`	`373`	`if (untitledModel.hasAssociatedFilePath) {`
`373`		`- untitledDescription = this.labelService.getUriLabel(resources.dirname(untitledModel.resource), { relative: true });`
	`374`	`+ untitledDescription = this.labelService.getUriLabel(dirname(untitledModel.resource), { relative: true });`
`374`	`375`	`} else {`
`375`	`376`	`untitledDescription = untitledModel.resource.path;`
`376`	`377`	`}`
`377`	`378`
`378`	`379`	`if (label.name !== untitledDescription) {`
`379`	`380`	`label.description = untitledDescription;`
	`381`	`+ } else if (label.description === posix.sep) {`
	`382`	`+ label.description = undefined; // unset showing just "/" for untitled without associated resource`
`380`	`383`	`}`
`381`	`384`	`}`
`382`	`385`	`}`