Move case sensitivity check earlier in isDescendant (#8197)

alexr00 · web-flow · commit b31ac1c7efd5 · 2025-12-03T13:59:49.000+01:00
diff --git a/src/common/utils.ts b/src/common/utils.ts
@@ -103,6 +103,12 @@ function isWindowsPath(path: string): boolean {
 }
 
 export function isDescendant(parent: string, descendant: string, separator: string = sep): boolean {
+	// Windows is case insensitive
+	if (isWindowsPath(parent)) {
+		parent = parent.toLowerCase();
+		descendant = descendant.toLowerCase();
+	}
+
 	if (parent === descendant) {
 		return true;
 	}
@@ -111,12 +117,6 @@ export function isDescendant(parent: string, descendant: string, separator: stri
 		parent += separator;
 	}
 
-	// Windows is case insensitive
-	if (isWindowsPath(parent)) {
-		parent = parent.toLowerCase();
-		descendant = descendant.toLowerCase();
-	}
-
 	return descendant.startsWith(parent);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,12 @@ function isWindowsPath(path: string): boolean {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`export function isDescendant(parent: string, descendant: string, separator: string = sep): boolean {`
	`106`	`+ // Windows is case insensitive`
	`107`	`+ if (isWindowsPath(parent)) {`
	`108`	`+ parent = parent.toLowerCase();`
	`109`	`+ descendant = descendant.toLowerCase();`
	`110`	`+ }`
	`111`	`+`
`106`	`112`	`if (parent === descendant) {`
`107`	`113`	`return true;`
`108`	`114`	`}`
`@@ -111,12 +117,6 @@ export function isDescendant(parent: string, descendant: string, separator: stri`
`111`	`117`	`parent += separator;`
`112`	`118`	`}`
`113`	`119`
`114`		`- // Windows is case insensitive`
`115`		`- if (isWindowsPath(parent)) {`
`116`		`- parent = parent.toLowerCase();`
`117`		`- descendant = descendant.toLowerCase();`
`118`		`- }`
`119`		`-`
`120`	`120`	`return descendant.startsWith(parent);`
`121`	`121`	`}`
`122`	`122`