debug: fix location references not working on remotes

Fixes #225967
microsoft · Aug 21, 2024 · e9de57d · e9de57d
1 parent d193e4b
commit e9de57d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -135,19 +135,12 @@ export class LinkDetector {
 		const link = this.createLink(text);
 		this.decorateLink(link, undefined, text, hoverBehavior, async (preserveFocus: boolean) => {
 			const location = await session.resolveLocationReference(locationReference);
-
-			await this.editorService.openEditor({
-				resource: location.source.uri,
-				options: {
-					preserveFocus,
-					selection: {
-						startLineNumber: location.line,
-						startColumn: location.column,
-						endLineNumber: location.endLine,
-						endColumn: location.endColumn,
-					},
-				},
-			});
+			await location.source.openInEditor(this.editorService, {
+				startLineNumber: location.line,
+				startColumn: location.column,
+				endLineNumber: location.endLine ?? location.line,
+				endColumn: location.endColumn ?? location.column,
+			}, preserveFocus);
 		});
 
 		return link;

diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts
@@ -307,6 +307,9 @@ function convertPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePath: (toDA:
 							di.body?.instructions.forEach(di => fixSourcePath(false, di.location));
 						}
 						break;
+					case 'locations':
+						fixSourcePath(false, (<DebugProtocol.LocationsResponse>response).body?.source);
+						break;
 					default:
 						break;
 				}