Document excerpt for Razor, and fix Find All Refs

src/Features/Core/Portable/CodeLens/CodeLensReferencesService.cs

@@ -14,7 +14,6 @@
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.LanguageService;
-using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
@@ -224,14 +223,21 @@ public async Task<ImmutableArray<ReferenceLocationDescriptor>> MapReferenceLocat
 
             var descriptor = descriptorAndDocument.Descriptor;
             var span = new TextSpan(descriptor.SpanStart, descriptor.SpanLength);
-            var results = await SpanMappingHelper.TryGetMappedSpanResultAsync(document, [span], cancellationToken).ConfigureAwait(false);
-            if (results is null)
+
+            if (!SpanMappingHelper.CanMapSpans(document))
             {
                 // for normal document, just add one as they are
                 list.Add(descriptor);
                 continue;
             }
 
+            var results = await SpanMappingHelper.TryGetMappedSpanResultAsync(document, [span], cancellationToken).ConfigureAwait(false);
+            if (results is null)
+            {
+                // If the document can map spans, but this span wasn't mapped, drop the result
+                continue;
+            }
+
             var mappedSpans = results.GetValueOrDefault();
 
             // external component violated contracts. the mapper should preserve input order/count. 
@@ -246,36 +252,13 @@ public async Task<ImmutableArray<ReferenceLocationDescriptor>> MapReferenceLocat
                 continue;
             }
 
-            var excerpter = document.DocumentServiceProvider.GetService<IDocumentExcerptService>();
-            if (excerpter == null)
+            if (!DocumentExcerptHelper.CanExcerpt(document))
             {
-                if (document.IsRazorSourceGeneratedDocument())
-                {
-                    // HACK: Razor doesn't have has a workspace level excerpt service, but if we just return a simple descriptor here,
-                    // the user at least sees something, can navigate, and Razor can improve this later if necessary. Until
-                    // https://github.com/dotnet/roslyn/issues/79699 is fixed this won't get hit anyway.
-                    list.Add(new ReferenceLocationDescriptor(
-                        descriptor.LongDescription,
-                        descriptor.Language,
-                        descriptor.Glyph,
-                        result.Span.Start,
-                        result.Span.Length,
-                        result.LinePositionSpan.Start.Line,
-                        result.LinePositionSpan.Start.Character,
-                        result.FilePath,
-                        descriptor.ReferenceLineText,
-                        descriptor.ReferenceStart,
-                        descriptor.ReferenceLength,
-                        "",
-                        "",
-                        "",
-                        ""));
-                }
                 continue;
             }
 
-            var referenceExcerpt = await excerpter.TryExcerptAsync(document, span, ExcerptMode.SingleLine, classificationOptions, cancellationToken).ConfigureAwait(false);
-            var tooltipExcerpt = await excerpter.TryExcerptAsync(document, span, ExcerptMode.Tooltip, classificationOptions, cancellationToken).ConfigureAwait(false);
+            var referenceExcerpt = await DocumentExcerptHelper.TryExcerptAsync(document, span, ExcerptMode.SingleLine, classificationOptions, cancellationToken).ConfigureAwait(false);
+            var tooltipExcerpt = await DocumentExcerptHelper.TryExcerptAsync(document, span, ExcerptMode.Tooltip, classificationOptions, cancellationToken).ConfigureAwait(false);
 
             var (text, start, length) = GetReferenceInfo(referenceExcerpt, descriptor);
             var (before1, before2, after1, after2) = GetReferenceTexts(referenceExcerpt, tooltipExcerpt, descriptor);

src/Features/Core/Portable/FindUsages/DefinitionItemFactory.cs

@@ -12,7 +12,7 @@
 using Microsoft.CodeAnalysis.Features.RQName;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.FindSymbols.Finders;
-using Microsoft.CodeAnalysis.Shared.Collections;
+using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
@@ -244,8 +244,8 @@ private static async Task<ImmutableArray<DocumentSpan>> GetSourceLocationsAsync(
         foreach (var location in locations)
         {
             if (location.IsInSource &&
-                (includeHiddenLocations || location.IsVisibleSourceLocation()) &&
-                solution.GetDocument(location.SourceTree) is { } document)
+                solution.GetDocument(location.SourceTree) is { } document &&
+                (includeHiddenLocations || document.IsRazorSourceGeneratedDocument() || location.IsVisibleSourceLocation()))
             {
                 var isGeneratedCode = await document.IsGeneratedCodeAsync(cancellationToken).ConfigureAwait(false);
                 source.Add(new DocumentSpan(document, location.SourceSpan, isGeneratedCode));
@@ -300,6 +300,10 @@ private static ImmutableDictionary<string, string> GetProperties(ISymbol definit
     {
         var location = referenceLocation.Location;
 
+        // Razor has a mapping service that can map from hidden locations, or will drop results if it wants to,
+        // so hidden locations aren't a problem, and are actually desirable.
+        includeHiddenLocations |= referenceLocation.Document.IsRazorSourceGeneratedDocument();
+
         Debug.Assert(location.IsInSource);
         if (!location.IsVisibleSourceLocation() &&
             !includeHiddenLocations)

src/LanguageServer/Protocol/Extensions/ProtocolConversions.cs

@@ -486,37 +486,40 @@ public static LSP.Range TextSpanToRange(TextSpan textSpan, SourceText text)
     {
         Debug.Assert(document.FilePath != null);
 
-        var result = document is Document d
-            ? await SpanMappingHelper.TryGetMappedSpanResultAsync(d, [textSpan], cancellationToken).ConfigureAwait(false)
-            : null;
-        if (result == null)
-            return await ConvertTextSpanToLocationAsync(document, textSpan, isStale, cancellationToken).ConfigureAwait(false);
+        if (document is Document d &&
+            SpanMappingHelper.CanMapSpans(d))
+        {
+            var result = await SpanMappingHelper.TryGetMappedSpanResultAsync(d, [textSpan], cancellationToken).ConfigureAwait(false);
+            if (result is not [{ IsDefault: false } mappedSpan])
+            {
+                // Couldn't map the span, but mapping is supported, so the mapper must not want to show include this result
+                return null;
+            }
 
-        var mappedSpan = result.Value.Single();
-        if (mappedSpan.IsDefault)
-            return await ConvertTextSpanToLocationAsync(document, textSpan, isStale, cancellationToken).ConfigureAwait(false);
+            DocumentUri? uri = null;
+            try
+            {
+                if (PathUtilities.IsAbsolute(mappedSpan.FilePath))
+                    uri = CreateAbsoluteDocumentUri(mappedSpan.FilePath);
+            }
+            catch (UriFormatException)
+            {
+            }
 
-        DocumentUri? uri = null;
-        try
-        {
-            if (PathUtilities.IsAbsolute(mappedSpan.FilePath))
-                uri = CreateAbsoluteDocumentUri(mappedSpan.FilePath);
-        }
-        catch (UriFormatException)
-        {
-        }
+            if (uri == null)
+            {
+                context?.TraceWarning($"Could not convert '{mappedSpan.FilePath}' to uri");
+                return null;
+            }
 
-        if (uri == null)
-        {
-            context?.TraceWarning($"Could not convert '{mappedSpan.FilePath}' to uri");
-            return null;
+            return new LSP.Location
+            {
+                DocumentUri = uri,
+                Range = MappedSpanResultToRange(mappedSpan)
+            };
         }
 
-        return new LSP.Location
-        {
-            DocumentUri = uri,
-            Range = MappedSpanResultToRange(mappedSpan)
-        };
+        return await ConvertTextSpanToLocationAsync(document, textSpan, isStale, cancellationToken).ConfigureAwait(false);
 
         static async Task<LSP.Location> ConvertTextSpanToLocationAsync(
             TextDocument document,

src/LanguageServer/ProtocolUnitTests/References/FindAllReferencesHandlerTests.cs

@@ -379,7 +379,45 @@ public void M()
 
         var results = await RunFindAllReferencesAsync(testLspServer, testLspServer.GetLocations("caret").First());
         Assert.Equal(2, results.Length);
-        Assert.True(results[1].Location.DocumentUri.GetRequiredParsedUri().LocalPath.EndsWith("generated_file.cs"));
+        Assert.True(results.Any(r => r.Location.DocumentUri.GetRequiredParsedUri().LocalPath.EndsWith("generated_file.cs")));
+
+        var service = Assert.IsType<TestSourceGeneratedDocumentSpanMappingService>(workspace.Services.GetService<ISourceGeneratedDocumentSpanMappingService>());
+        Assert.True(service.DidMapSpans);
+    }
+
+    [Theory, CombinatorialData]
+    public async Task TestFindReferencesAsync_WithRazorSourceGeneratedFile_HiddenSpan(bool mutatingLspWorkspace)
+    {
+        var generatedMarkup = """
+            public class B
+            {
+            #line hidden
+                public void {|reference:M|}()
+                {
+                }
+            }
+            """;
+        await using var testLspServer = await CreateTestLspServerAsync("""
+            public class A
+            {
+                public void M()
+                {
+                    new B().{|caret:M|}();
+                }
+            }
+            """, mutatingLspWorkspace, CapabilitiesWithVSExtensions);
+
+        TestFileMarkupParser.GetSpans(generatedMarkup, out var generatedCode, out ImmutableDictionary<string, ImmutableArray<TextSpan>> spans);
+        var generatedSourceText = SourceText.From(generatedCode);
+
+        var razorGenerator = new Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator((c) => c.AddSource("generated_file.cs", generatedCode));
+        var workspace = testLspServer.TestWorkspace;
+        var project = workspace.CurrentSolution.Projects.First().AddAnalyzerReference(new TestGeneratorReference(razorGenerator));
+        workspace.TryApplyChanges(project.Solution);
+
+        var results = await RunFindAllReferencesAsync(testLspServer, testLspServer.GetLocations("caret").First());
+        Assert.Equal(2, results.Length);
+        Assert.True(results.Any(r => r.Location.DocumentUri.GetRequiredParsedUri().LocalPath.EndsWith("generated_file.cs")));
 
         var service = Assert.IsType<TestSourceGeneratedDocumentSpanMappingService>(workspace.Services.GetService<ISourceGeneratedDocumentSpanMappingService>());
         Assert.True(service.DidMapSpans);

src/LanguageServer/ProtocolUnitTests/TestSourceGeneratedDocumentSpanMappingService.cs

@@ -25,7 +25,7 @@ internal class TestSourceGeneratedDocumentSpanMappingService() : ISourceGenerate
 
     public bool CanMapSpans(SourceGeneratedDocument sourceGeneratedDocument)
     {
-        throw new NotImplementedException();
+        return sourceGeneratedDocument.IsRazorSourceGeneratedDocument();
     }
 
     public Task<ImmutableArray<MappedTextChange>> GetMappedTextChangesAsync(SourceGeneratedDocument oldDocument, SourceGeneratedDocument newDocument, CancellationToken cancellationToken)
@@ -38,6 +38,7 @@ public Task<ImmutableArray<MappedSpanResult>> MapSpansAsync(SourceGeneratedDocum
         if (document.IsRazorSourceGeneratedDocument())
         {
             DidMapSpans = true;
+            return Task.FromResult<ImmutableArray<MappedSpanResult>>([new(document.FilePath, default, default)]);
         }
 
         return Task.FromResult(ImmutableArray<MappedSpanResult>.Empty);

src/Tools/ExternalAccess/Razor/Features/IRazorSourceGeneratedDocumentExcerptService.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.Razor;
+
+internal interface IRazorSourceGeneratedDocumentExcerptService
+{
+    Task<RazorExcerptResult?> TryExcerptAsync(SourceGeneratedDocument document, TextSpan span, RazorExcerptMode razorMode, RazorClassificationOptionsWrapper options, CancellationToken cancellationToken);
+}

src/Tools/ExternalAccess/Razor/Features/RazorClassificationOptionsWrapper.cs

@@ -2,14 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Runtime.Serialization;
 using Microsoft.CodeAnalysis.Classification;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.Razor
 {
+    [DataContract]
     internal readonly struct RazorClassificationOptionsWrapper
     {
         public static RazorClassificationOptionsWrapper Default = new(ClassificationOptions.Default);
 
+        [DataMember(Order = 0)]
         internal readonly ClassificationOptions UnderlyingObject;
 
         public RazorClassificationOptionsWrapper(ClassificationOptions underlyingObject)

src/Tools/ExternalAccess/Razor/Features/RazorMappedSpanResult.cs

@@ -22,11 +22,6 @@ internal readonly struct RazorMappedSpanResult
 
     public RazorMappedSpanResult(string filePath, LinePositionSpan linePositionSpan, TextSpan span)
     {
-        if (string.IsNullOrEmpty(filePath))
-        {
-            throw new ArgumentException(nameof(filePath));
-        }
-
         FilePath = filePath;
         LinePositionSpan = linePositionSpan;
         Span = span;

src/Tools/ExternalAccess/Razor/Features/RazorSourceGeneratedDocumentExcerptServiceWrapper.cs

@@ -0,0 +1,53 @@
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.Razor;
+
+[ExportWorkspaceService(typeof(ISourceGeneratedDocumentExcerptService)), Shared]
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal sealed class RazorSourceGeneratedDocumentExcerptServiceWrapper(
+    [Import(AllowDefault = true)] IRazorSourceGeneratedDocumentExcerptService? implementation) : ISourceGeneratedDocumentExcerptService
+{
+    private readonly IRazorSourceGeneratedDocumentExcerptService? _implementation = implementation;
+
+    public bool CanExcerpt(SourceGeneratedDocument document)
+    {
+        return _implementation is not null && document.IsRazorSourceGeneratedDocument();
+    }
+
+    public async Task<ExcerptResult?> TryExcerptAsync(SourceGeneratedDocument document, TextSpan span, ExcerptMode mode, ClassificationOptions classificationOptions, CancellationToken cancellationToken)
+    {
+        if (_implementation is null || !document.IsRazorSourceGeneratedDocument())
+        {
+            return null;
+        }
+
+        var razorMode = mode switch
+        {
+            ExcerptMode.SingleLine => RazorExcerptMode.SingleLine,
+            ExcerptMode.Tooltip => RazorExcerptMode.Tooltip,
+            _ => throw ExceptionUtilities.UnexpectedValue(mode),
+        };
+
+        var options = new RazorClassificationOptionsWrapper(classificationOptions);
+        var result = await _implementation.TryExcerptAsync(document, span, razorMode, options, cancellationToken).ConfigureAwait(false);
+
+        if (result is null)
+            return null;
+
+        var razorExcerpt = result.Value;
+        return new ExcerptResult(razorExcerpt.Content, razorExcerpt.MappedSpan, razorExcerpt.ClassifiedSpans, razorExcerpt.Document, razorExcerpt.Span);
+    }
+}

src/Tools/ExternalAccess/Razor/Features/RazorSourceGeneratedDocumentSpanMappingServiceWrapper.cs

@@ -69,7 +69,8 @@ public async Task<ImmutableArray<MappedSpanResult>> MapSpansAsync(SourceGenerate
         }
 
         var mappedSpans = await _implementation.MapSpansAsync(document, spans, cancellationToken).ConfigureAwait(false);
-        if (mappedSpans.Length != spans.Length)
+        if (mappedSpans.IsDefault ||
+            mappedSpans.Length != spans.Length)
         {
             return [];
         }

src/VisualStudio/Core/Def/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs

@@ -471,15 +471,13 @@ protected async Task AddDocumentSpanEntriesAsync(
             var document = documentSpan.Document;
             var sourceSpan = documentSpan.SourceSpan;
 
-            var excerptService = document.DocumentServiceProvider.GetService<IDocumentExcerptService>();
-
             // Fetching options is expensive enough to try to avoid it if we can.  So only fetch this if absolutely necessary.
             ClassificationOptions? options = null;
-            if (excerptService != null)
+            if (DocumentExcerptHelper.CanExcerpt(document))
             {
                 options ??= _globalOptions.GetClassificationOptions(document.Project.Language);
 
-                var result = await excerptService.TryExcerptAsync(document, sourceSpan, ExcerptMode.SingleLine, options.Value, cancellationToken).ConfigureAwait(false);
+                var result = await DocumentExcerptHelper.TryExcerptAsync(document, sourceSpan, ExcerptMode.SingleLine, options.Value, cancellationToken).ConfigureAwait(false);
                 if (result != null)
                     return (result.Value, AbstractDocumentSpanEntry.GetLineContainingPosition(result.Value.Content, result.Value.MappedSpan.Start));
             }

src/VisualStudio/Core/Def/FindReferences/Entries/DocumentSpanEntry.cs

@@ -183,11 +183,10 @@ private DisposableToolTip CreateDisposableToolTip(Document document, TextSpan so
             var controlService = document.Project.Solution.Services.GetRequiredService<IContentControlService>();
             var sourceText = document.GetTextSynchronously(CancellationToken.None);
 
-            var excerptService = document.DocumentServiceProvider.GetService<IDocumentExcerptService>();
-            if (excerptService != null)
+            if (DocumentExcerptHelper.CanExcerpt(document))
             {
                 var classificationOptions = Presenter._globalOptions.GetClassificationOptions(document.Project.Language);
-                var excerpt = this.Presenter.ThreadingContext.JoinableTaskFactory.Run(() => excerptService.TryExcerptAsync(document, sourceSpan, ExcerptMode.Tooltip, classificationOptions, CancellationToken.None));
+                var excerpt = this.Presenter.ThreadingContext.JoinableTaskFactory.Run(() => DocumentExcerptHelper.TryExcerptAsync(document, sourceSpan, ExcerptMode.Tooltip, classificationOptions, CancellationToken.None));
                 if (excerpt != null)
                 {
                     // get tooltip from excerpt service

src/Workspaces/Core/Portable/Classification/ClassifiedSpan.cs

@@ -3,14 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Runtime.Serialization;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Classification;
 
+[DataContract]
 public readonly struct ClassifiedSpan(TextSpan textSpan, string classificationType) : IEquatable<ClassifiedSpan>
 {
+    [DataMember(Order = 0)]
     public string ClassificationType { get; } = classificationType;
+    [DataMember(Order = 1)]
     public TextSpan TextSpan { get; } = textSpan;
 
     public ClassifiedSpan(string classificationType, TextSpan textSpan)