From f77ee0892ab2ab9669ca55e33cdb39d6b188d9c7 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 18 Feb 2025 06:39:48 -0800
Subject: [PATCH] Make sure folders are requested when files are

Fixes #241090
---
 .../suggest/browser/terminalCompletionService.ts          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 9834bec15118b..5211abb5869d9 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -204,9 +204,13 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			// for tests, make sure the right path separator is used
 			promptValue = promptValue.replaceAll(/[\\/]/g, resourceRequestConfig.pathSeparator);
 		}
-		const cwd = URI.revive(resourceRequestConfig.cwd);
-		const foldersRequested = resourceRequestConfig.foldersRequested ?? false;
+
+		// Files requested implies folders requested since the file could be in any folder. We could
+		// provide diagnostics when a folder is provided where a file is expected.
+		const foldersRequested = (resourceRequestConfig.foldersRequested || resourceRequestConfig.filesRequested) ?? false;
 		const filesRequested = resourceRequestConfig.filesRequested ?? false;
+
+		const cwd = URI.revive(resourceRequestConfig.cwd);
 		if (!cwd || (!foldersRequested && !filesRequested)) {
 			return;
 		}