Add collapse tilde tests, fix edge cases

Author: Tyriar

src/vs/platform/terminal/common/terminalEnvironment.ts

@@ -24,10 +24,14 @@ export function collapseTildePath(path: string | undefined, userHome: string | u
 	if (!userHome) {
 		return path;
 	}
-	const normalizedPath = path.replace(/\\/g, '/\//').toLowerCase();
-	const normalizedUserHome = userHome.replace(/\\/g, '/\//').toLowerCase();
+	// Trim the trailing separator from the end if it exists
+	if (userHome.match(/[\/\\]$/)) {
+		userHome = userHome.slice(0, userHome.length - 1);
+	}
+	const normalizedPath = path.replace(/\\/g, '/').toLowerCase();
+	const normalizedUserHome = userHome.replace(/\\/g, '/').toLowerCase();
 	if (!normalizedPath.includes(normalizedUserHome)) {
 		return path;
 	}
-	return `~${separator}${path.slice(userHome.length)}`;
+	return `~${separator}${path.slice(userHome.length + 1)}`;
 }

src/vs/platform/terminal/test/common/terminalEnvironment.test.ts

@@ -18,15 +18,23 @@ suite('terminalEnvironment', () => {
 		});
 		test('should not collapse when user home isn\'t present', () => {
 			strictEqual(collapseTildePath('/foo', '/bar', '/'), '/foo');
-			strictEqual(collapseTildePath('c:\\foo', 'C:\\bar', '\\'), 'C:\\foo');
+			strictEqual(collapseTildePath('C:\\foo', 'C:\\bar', '\\'), 'C:\\foo');
 		});
 		test('should collapse with Windows separators', () => {
 			strictEqual(collapseTildePath('C:\\foo\\bar', 'C:\\foo', '\\'), '~\\bar');
+			strictEqual(collapseTildePath('C:\\foo\\bar', 'C:\\foo\\', '\\'), '~\\bar');
+			strictEqual(collapseTildePath('C:\\foo\\bar\\baz', 'C:\\foo\\', '\\'), '~\\bar\\baz');
 			strictEqual(collapseTildePath('C:\\foo\\bar\\baz', 'C:\\foo', '\\'), '~\\bar\\baz');
 		});
+		test('should collapse mixed case with Windows separators', () => {
+			strictEqual(collapseTildePath('c:\\foo\\bar', 'C:\\foo', '\\'), '~\\bar');
+			strictEqual(collapseTildePath('C:\\foo\\bar\\baz', 'c:\\foo', '\\'), '~\\bar\\baz');
+		});
 		test('should collapse with Posix separators', () => {
 			strictEqual(collapseTildePath('/foo/bar', '/foo', '/'), '~/bar');
+			strictEqual(collapseTildePath('/foo/bar', '/foo/', '/'), '~/bar');
 			strictEqual(collapseTildePath('/foo/bar/baz', '/foo', '/'), '~/bar/baz');
+			strictEqual(collapseTildePath('/foo/bar/baz', '/foo/', '/'), '~/bar/baz');
 		});
 	});
 });