explorer model: rtrim a bit less

isidorn · isidorn · commit bd4cb40bd495 · 2018-04-26T14:34:44.000+02:00
diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -338,14 +338,14 @@ export class ExplorerItem {
 		if (resource && this.resource.scheme === resource.scheme && this.resource.authority === resource.authority &&
 			(isLinux ? startsWith(resource.path, this.resource.path) : startsWithIgnoreCase(resource.path, this.resource.path))
 		) {
-			return this.findByPath(resource.path, this.resource.path.length);
+			return this.findByPath(rtrim(resource.path, paths.nativeSep), this.resource.path.length);
 		}
 
 		return null; //Unable to find
 	}
 
 	private findByPath(path: string, index: number): ExplorerItem {
-		if (paths.isEqual(rtrim(this.resource.path, paths.sep), rtrim(path, paths.sep), !isLinux)) {
+		if (paths.isEqual(rtrim(this.resource.path, paths.sep), path, !isLinux)) {
 			return this;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -338,14 +338,14 @@ export class ExplorerItem {`
`338`	`338`	`if (resource && this.resource.scheme === resource.scheme && this.resource.authority === resource.authority &&`
`339`	`339`	`(isLinux ? startsWith(resource.path, this.resource.path) : startsWithIgnoreCase(resource.path, this.resource.path))`
`340`	`340`	`) {`
`341`		`- return this.findByPath(resource.path, this.resource.path.length);`
	`341`	`+ return this.findByPath(rtrim(resource.path, paths.nativeSep), this.resource.path.length);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`return null; //Unable to find`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`private findByPath(path: string, index: number): ExplorerItem {`
`348`		`- if (paths.isEqual(rtrim(this.resource.path, paths.sep), rtrim(path, paths.sep), !isLinux)) {`
	`348`	`+ if (paths.isEqual(rtrim(this.resource.path, paths.sep), path, !isLinux)) {`
`349`	`349`	`return this;`
`350`	`350`	`}`
`351`	`351`