From 2f7cd441c0922653a4e8a5913b4079de55d9012b Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 12 Jun 2025 12:58:58 -0700
Subject: [PATCH] Don't revive URI before sending from ext to main

Fixes #235331
---
 .../terminal-suggest/src/terminalSuggestMain.ts    | 14 +++++++-------
 .../workbench/api/common/extHostTypeConverters.ts  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 95567c16fae..ab0a8f2cbad 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -148,13 +148,13 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 
 			if (terminal.shellIntegration?.cwd && (result.filesRequested || result.foldersRequested)) {
-				let cwd;
-				if (vscode.env.remoteName) {
-					cwd = vscode.Uri.file((result.cwd ?? terminal.shellIntegration.cwd).path).with({ authority: vscode.env.remoteName, scheme: 'vscode-remote' });
-				} else {
-					cwd = vscode.Uri.file((result.cwd ?? terminal.shellIntegration.cwd).fsPath);
-				}
-				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, fileExtensions: result.fileExtensions, cwd, env: terminal.shellIntegration?.env?.value, });
+				return new vscode.TerminalCompletionList(result.items, {
+					filesRequested: result.filesRequested,
+					foldersRequested: result.foldersRequested,
+					fileExtensions: result.fileExtensions,
+					cwd: result.cwd ?? terminal.shellIntegration.cwd,
+					env: terminal.shellIntegration?.env?.value,
+				});
 			}
 			return result.items;
 		}
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 35e2cc93dea..e4a7378a3ae 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -3205,7 +3205,7 @@ export namespace TerminalResourceRequestConfig {
 		return {
 			...resourceRequestConfig,
 			pathSeparator,
-			cwd: resourceRequestConfig.cwd ? URI.revive(resourceRequestConfig.cwd) : undefined,
+			cwd: resourceRequestConfig.cwd,
 		};
 	}
 }