Normalize drive letter casing for global eval contexts

Fixes #5237
Dart-Code · Sep 2, 2024 · b1da25e · b1da25e
1 parent 6641097
commit b1da25e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/extension/providers/debug_adapter_global_evaluation_context_factory.ts b/src/extension/providers/debug_adapter_global_evaluation_context_factory.ts
@@ -1,4 +1,5 @@
 import * as vs from "vscode";
+import { forceWindowsDriveLetterToUppercaseInUriString } from "../../shared/utils/fs";
 import { getActiveRealFileEditor, isDartDocument } from "../editors";
 
 export class DartDebugAdapterGlobalEvaluationContextFactory implements vs.DebugAdapterTrackerFactory {
@@ -13,8 +14,10 @@ class DartDebugAdapterGlobalEvaluationContext implements vs.DebugAdapterTracker
 			const doc = getActiveRealFileEditor()?.document;
 			if (doc && isDartDocument(doc)) {
 				// Don't escape colons in drive letters, as the shipped DAP code here
-				// will call `lookupPackageUris` on this URI and it won't match.
-				message.arguments.context = doc?.uri.toString(true);
+				// will call `lookupPackageUris` on this URI and it won't match. Also normalize
+				// the drive letter because otherwise it might not work for Windows -> Android
+				// (see https://github.com/Dart-Code/Dart-Code/issues/5237).
+				message.arguments.context = forceWindowsDriveLetterToUppercaseInUriString(doc.uri.toString(true));
 			}
 		}
 	}