From b8fb79b0fbcf699b24db985561062967f173ac38 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 3 Feb 2025 02:44:17 -0800
Subject: [PATCH] Add test for parsing out multiple CD PATHs and files

---
 .../browser/terminalCompletionService.test.ts | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
index 92d723eb8d9a5..86fdb70e233da 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
@@ -423,5 +423,49 @@ suite('TerminalCompletionService', () => {
 				{ label: '../', detail: '/' },
 			], { replacementIndex: 3, replacementLength: 0 });
 		});
+
+		test('cd | should support pulling from multiple paths in $CDPATH', async () => {
+			configurationService.setUserConfiguration('terminal.integrated.suggest.cdPath', 'relative');
+			const pathPrefix = isWindows ? 'c:\\' : '/';
+			const delimeter = isWindows ? ';' : ':';
+			const separator = isWindows ? '\\' : '/';
+			shellEnvDetection.setEnvironment({ CDPATH: `${pathPrefix}cdpath_value${delimeter}cdpath_value2${separator}inner_dir` }, true);
+
+			const uriPathPrefix = isWindows ? 'file:///c:/' : 'file:///';
+			validResources = [
+				URI.parse(`${uriPathPrefix}test`),
+				URI.parse(`${uriPathPrefix}cd_path_value`)
+				,
+				URI.parse(`${uriPathPrefix}cd_path_value/inner_dir`)
+			];
+			childResources = [
+				{ resource: URI.parse(`${uriPathPrefix}cdpath_value/folder1/`), isDirectory: true },
+				{ resource: URI.parse(`${uriPathPrefix}cdpath_value/folder2/`), isDirectory: true },
+				{ resource: URI.parse(`${uriPathPrefix}cdpath_value/file1.txt`), isFile: true },
+				{ resource: URI.parse(`${uriPathPrefix}cdpath_value2/inner_dir/folder1/`), isDirectory: true },
+				{ resource: URI.parse(`${uriPathPrefix}cdpath_value2/inner_dir/folder2/`), isDirectory: true },
+				{ resource: URI.parse(`${uriPathPrefix}cdpath_value2/inner_dir/file1.txt`), isFile: true },
+			];
+
+			const resourceRequestConfig: TerminalResourceRequestConfig = {
+				cwd: URI.parse(`${uriPathPrefix}test`),
+				foldersRequested: true,
+				filesRequested: true,
+				pathSeparator,
+				// TODO: This is a hack to make the test pass, clean up when https://github.com/microsoft/vscode/issues/239411 is done
+				shouldNormalizePrefix: !isWindows
+			};
+			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ', 3, provider, capabilities);
+
+			const finalPrefix = isWindows ? 'C:\\' : '/';
+			assertCompletions(result, [
+				{ label: '.', detail: `${finalPrefix}test/` },
+				{ label: 'folder1', detail: `CDPATH ${finalPrefix}cdpath_value/folder1/` },
+				{ label: 'folder2', detail: `CDPATH ${finalPrefix}cdpath_value/folder2/` },
+				{ label: 'folder1', detail: `CDPATH ${finalPrefix}cdpath_value2/inner_dir/folder1/` },
+				{ label: 'folder2', detail: `CDPATH ${finalPrefix}cdpath_value2/inner_dir/folder2/` },
+				{ label: '../', detail: finalPrefix },
+			], { replacementIndex: 3, replacementLength: 0 });
+		});
 	});
 });