Simplify code per review: use IsRazorFilePath, pattern matching, remove DocumentFilePaths checks, fix string literal handling to run before C# GTD

Co-authored-by: davidwengier <[email protected]>

Author: Copilot

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractDefinitionService.cs

@@ -4,10 +4,8 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -131,11 +129,15 @@ private async Task<LspRange> GetNavigateRangeAsync(IDocumentSnapshot documentSna
             var literalText = token.ValueText;
             _logger.LogDebug($"Found string literal: {literalText}");
 
-            // Try to resolve the file path
-            if (TryResolveFilePath(documentSnapshot, literalText, out var resolvedPath))
+            // Only process if it looks like a Razor file path
+            if (literalText.IsRazorFilePath())
             {
-                _logger.LogDebug($"Resolved file path: {resolvedPath}");
-                return [LspFactory.CreateLocation(resolvedPath, LspFactory.DefaultRange)];
+                // Try to resolve the file path
+                if (TryResolveFilePath(documentSnapshot, literalText, out var resolvedPath))
+                {
+                    _logger.LogDebug($"Resolved file path: {resolvedPath}");
+                    return [LspFactory.CreateLocation(resolvedPath, LspFactory.DefaultRange)];
+                }
             }
         }
 
@@ -151,18 +153,10 @@ private bool TryResolveFilePath(IDocumentSnapshot documentSnapshot, string fileP
             return false;
         }
 
-        // Check if the file extension is .cshtml or .razor
-        var extension = Path.GetExtension(filePath);
-        if (!extension.Equals(".cshtml", StringComparison.OrdinalIgnoreCase) &&
-            !extension.Equals(".razor", StringComparison.OrdinalIgnoreCase))
-        {
-            return false;
-        }
-
         var project = documentSnapshot.Project;
 
         // Handle tilde paths (~/ or ~\) - these are relative to the project root
-        if (filePath.StartsWith("~/") || filePath.StartsWith("~\\"))
+        if (filePath is ['~', '/' or '\\', ..])
         {
             var projectDirectory = Path.GetDirectoryName(project.FilePath);
             if (projectDirectory is null)
@@ -174,14 +168,6 @@ private bool TryResolveFilePath(IDocumentSnapshot documentSnapshot, string fileP
             var relativePath = filePath.Substring(2).Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
             var candidatePath = Path.GetFullPath(Path.Combine(projectDirectory, relativePath));
 
-            // Check using path comparison since the project might not have the document loaded yet
-            var matchingPath = project.DocumentFilePaths.FirstOrDefault(d => PathUtilities.OSSpecificPathComparer.Equals(d, candidatePath));
-            if (matchingPath is not null)
-            {
-                resolvedPath = matchingPath;
-                return true;
-            }
-
             if (project.ContainsDocument(candidatePath))
             {
                 resolvedPath = candidatePath;
@@ -196,14 +182,6 @@ private bool TryResolveFilePath(IDocumentSnapshot documentSnapshot, string fileP
             var normalizedPath = filePath.Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
             var candidatePath = Path.GetFullPath(Path.Combine(currentDocumentDirectory, normalizedPath));
 
-            // Check using path comparison since the project might not have the document loaded yet
-            var matchingPath = project.DocumentFilePaths.FirstOrDefault(d => PathUtilities.OSSpecificPathComparer.Equals(d, candidatePath));
-            if (matchingPath is not null)
-            {
-                resolvedPath = matchingPath;
-                return true;
-            }
-
             if (project.ContainsDocument(candidatePath))
             {
                 resolvedPath = candidatePath;

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs

@@ -71,6 +71,21 @@ protected override IRemoteGoToDefinitionService CreateService(in ServiceArgs arg
             return Results(componentLocations);
         }
 
+        // Check if we're in a string literal with a file path (before calling C# which would navigate to String class)
+        if (positionInfo.LanguageKind is RazorLanguageKind.CSharp)
+        {
+            var stringLiteralLocations = await _definitionService.TryGetDefinitionFromStringLiteralAsync(
+                context.Snapshot,
+                positionInfo.Position.ToLinePosition(),
+                cancellationToken)
+                .ConfigureAwait(false);
+
+            if (stringLiteralLocations is { Length: > 0 })
+            {
+                return Results(stringLiteralLocations);
+            }
+        }
+
         if (positionInfo.LanguageKind is RazorLanguageKind.Html or RazorLanguageKind.Razor)
         {
             // If it isn't a Razor construct, and it isn't C#, let the server know to delegate to HTML.
@@ -93,19 +108,7 @@ protected override IRemoteGoToDefinitionService CreateService(in ServiceArgs arg
 
         if (locations is null and not [])
         {
-            // C# didn't return anything, check if we're in a string literal with a file path
-            var stringLiteralLocations = await _definitionService.TryGetDefinitionFromStringLiteralAsync(
-                context.Snapshot,
-                positionInfo.Position.ToLinePosition(),
-                cancellationToken)
-                .ConfigureAwait(false);
-
-            if (stringLiteralLocations is { Length: > 0 })
-            {
-                return Results(stringLiteralLocations);
-            }
-
-            // Nothing found, so we're done.
+            // C# didn't return anything, so we're done.
             return NoFurtherHandling;
         }