From 310c2eb5c45eae5c58ef6e5f3c6e90c5ef115a44 Mon Sep 17 00:00:00 2001
From: Brian Wilkerson <brianwilkerson@google.com>
Date: Fri, 6 Dec 2019 23:22:04 +0000
Subject: [PATCH] Display target file name as link text

Change-Id: I1a919db827709210e89ca6e7ecf5a9ed2c5e7d0c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/127300
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
---
 .../instrumentation_renderer.dart             | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart
index 000323699db8..fd76ced6c09c 100644
--- a/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart
+++ b/pkg/analysis_server/lib/src/edit/nnbd_migration/instrumentation_renderer.dart
@@ -457,13 +457,17 @@ class InstrumentationRenderer {
         regions.write('<ul>');
         for (var detail in region.details) {
           regions.write('<li>');
-          if (detail.target != null) {
-            String targetUri = _uriForTarget(detail.target, unitDir);
-            regions.write('<a href="$targetUri">');
-          }
           writeSplitLines(detail.description);
-          if (detail.target != null) {
-            regions.write('</a>');
+          NavigationTarget target = detail.target;
+          if (target != null) {
+            String relativePath = _relativePathToTarget(target, unitDir);
+            String targetUri = _uriForRelativePath(relativePath, target);
+            regions.write(' <a href="$targetUri">(');
+            regions.write(relativePath);
+            // TODO(brianwilkerson) Add the line number to the link text. This
+            //  will require that either the contents of all navigation targets
+            //  have been set or that line information has been saved.
+            regions.write(')</a>');
           }
           regions.write('</li>');
         }
@@ -507,14 +511,18 @@ class InstrumentationRenderer {
   }
 
   /// Return the URL that will navigate to the given [target].
-  String _uriForTarget(NavigationTarget target, String unitDir) {
+  String _relativePathToTarget(NavigationTarget target, String unitDir) {
     if (target == null) {
       // TODO(brianwilkerson) This is temporary support until we can get targets
       //  for all nodes.
       return '';
     }
-    String relativePath =
-        pathContext.relative(pathMapper.map(target.filePath), from: unitDir);
+    return pathContext.relative(pathMapper.map(target.filePath), from: unitDir);
+  }
+
+  /// Return the URL that will navigate to the given [target] in the file at the
+  /// given [relativePath].
+  String _uriForRelativePath(String relativePath, NavigationTarget target) {
     return '$relativePath#o${target.offset.toString()}';
   }
 }