[Sonic] Move a few more Razor features to be sonic compatible

src/Razor/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorDeclCSharpLoweringPhase.cs

@@ -134,7 +134,7 @@ protected override RazorCodeDocument ExecuteCore(RazorCodeDocument codeDocument,
         // The decl writer suppresses diagnostic collection because every diagnostic on the
         // decl tree is also reachable from the original tree the impl half lowers from;
         // letting both writers report would surface every Razor-detected issue twice.
-        var declDocument = RazorCSharpDocumentWriter.Write(declDocNode, codeDocument, reportDiagnostics: false, cancellationToken);
+        var declDocument = RazorCSharpDocumentWriter.Write(declDocNode, codeDocument, reportDiagnostics: false, isDeclarationDocument: true, cancellationToken: cancellationToken);
 
         return codeDocument.WithDeclCSharpDocument(declDocument);
     }

src/Razor/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorCSharpDocument.cs

@@ -17,13 +17,15 @@ public sealed class RazorCSharpDocument
     public ImmutableArray<SourceMapping> SourceMappingsSortedByGenerated { get; }
     public ImmutableArray<SourceMapping> SourceMappingsSortedByOriginal { get; }
     public ImmutableArray<LinePragma> LinePragmas { get; }
+    public bool IsDeclarationDocument { get; }
 
     public RazorCSharpDocument(
         RazorCodeDocument codeDocument,
         SourceText text,
         ImmutableArray<RazorDiagnostic> diagnostics,
         ImmutableArray<SourceMapping> sourceMappings = default,
-        ImmutableArray<LinePragma> linePragmas = default)
+        ImmutableArray<LinePragma> linePragmas = default,
+        bool isDeclarationDocument = false)
     {
         ArgHelper.ThrowIfNull(codeDocument);
         ArgHelper.ThrowIfNull(text);
@@ -48,5 +50,6 @@ public RazorCSharpDocument(
 
         SourceMappingsSortedByOriginal = SourceMappingsSortedByGenerated.Sort(static (m1, m2) => m1.OriginalSpan.CompareByStartThenLength(m2.OriginalSpan));
         LinePragmas = linePragmas.NullToEmpty();
+        IsDeclarationDocument = isDeclarationDocument;
     }
 }

src/Razor/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorCSharpDocumentWriter.cs

@@ -20,6 +20,7 @@ public static RazorCSharpDocument Write(
         DocumentIntermediateNode documentNode,
         RazorCodeDocument codeDocument,
         bool reportDiagnostics = true,
+        bool isDeclarationDocument = false,
         CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(codeDocument);
@@ -44,7 +45,8 @@ public static RazorCSharpDocument Write(
             text,
             context.GetDiagnostics(),
             context.GetSourceMappings(),
-            context.GetLinePragmas());
+            context.GetLinePragmas(),
+            isDeclarationDocument);
     }
 
     /// <summary>

src/Razor/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Formatting/DocumentFormattingBenchmark.cs

@@ -81,10 +81,10 @@ public void Setup()
         hostServicesProvider.SetWorkspaceProvider(new WorkspaceProvider(_workspace));
 
         var clientSettingsManager = new RemoteClientSettingsManager();
-        var documentMappingService = new RemoteDocumentMappingService(filePathService, snapshotManager, EmptyLoggerFactory.Instance);
-        var razorEditService = new RemoteRazorEditService(documentMappingService, clientSettingsManager, filePathService, snapshotManager, NoOpTelemetryReporter.Instance);
+        var documentMappingService = new DocumentMappingService(filePathService, snapshotManager, EmptyLoggerFactory.Instance);
+        var razorEditService = new RazorEditService(documentMappingService, clientSettingsManager, filePathService, snapshotManager, NoOpTelemetryReporter.Instance);
 
-        _formattingService = new RemoteRazorFormattingService(
+        _formattingService = new RazorFormattingService(
             documentMappingService,
             razorEditService,
             hostServicesProvider,

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs

@@ -62,7 +62,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
     protected override Task<TextEdit[]?> HandleRequestAsync(DocumentFormattingParams request, TextDocument razorDocument, CancellationToken cancellationToken)
     {
-        var csharpSyntaxFormattingOptions = CSharpFormatter.GetCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services, csharpSyntaxFormattingOptions: null);
+        var csharpSyntaxFormattingOptions = CSharpFormattingOptionsHelper.GetCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services, csharpSyntaxFormattingOptions: null);
         return HandleRequestAsync(request, razorDocument, csharpSyntaxFormattingOptions, cancellationToken);
     }
 

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostOnTypeFormattingEndpoint.cs

@@ -15,6 +15,8 @@
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.Workspaces.Settings;
 using Microsoft.CodeAnalysis.Text;
+using System.Collections.Frozen;
+using System;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
@@ -33,6 +35,10 @@ internal sealed class CohostOnTypeFormattingEndpoint(
     ILoggerFactory loggerFactory)
     : AbstractCohostDocumentEndpoint<DocumentOnTypeFormattingParams, TextEdit[]?>(incompatibleProjectService), IDynamicRegistrationProvider
 {
+    internal const string FirstTriggerCharacter = "}";
+    internal static readonly string[] MoreTriggerCharacters = [";", "\n", "{"];
+    internal static readonly FrozenSet<string> AllTriggerCharacterSet = FrozenSet.ToFrozenSet([FirstTriggerCharacter, .. MoreTriggerCharacters], StringComparer.Ordinal);
+
     private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
     private readonly IHtmlRequestInvoker _requestInvoker = requestInvoker;
     private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager;
@@ -51,8 +57,8 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
                 Method = Methods.TextDocumentOnTypeFormattingName,
                 RegisterOptions = new DocumentOnTypeFormattingRegistrationOptions()
                 {
-                    FirstTriggerCharacter = RazorFormattingService.FirstTriggerCharacter,
-                    MoreTriggerCharacter = RazorFormattingService.MoreTriggerCharacters
+                    FirstTriggerCharacter = FirstTriggerCharacter,
+                    MoreTriggerCharacter = MoreTriggerCharacters
                 }
             }];
         }
@@ -72,7 +78,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
             return null;
         }
 
-        if (!RazorFormattingService.AllTriggerCharacterSet.Contains(request.Character))
+        if (!AllTriggerCharacterSet.Contains(request.Character))
         {
             _logger.LogWarning($"Unexpected trigger character '{request.Character}'.");
             return null;
@@ -112,7 +118,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
             htmlChanges = htmlEdits.SelectAsArray(sourceText.GetTextChange);
         }
 
-        var csharpSyntaxFormattingOptions = CSharpFormatter.GetCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services, csharpSyntaxFormattingOptions: null);
+        var csharpSyntaxFormattingOptions = CSharpFormattingOptionsHelper.GetCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services, csharpSyntaxFormattingOptions: null);
         var options = RazorFormattingOptions.From(request.Options, clientSettings.AdvancedSettings.CodeBlockBraceOnNextLine, clientSettings.AdvancedSettings.AttributeIndentStyle, csharpSyntaxFormattingOptions);
 
         _logger.LogDebug($"Calling OOP with the {htmlChanges.Length} html edits, so it can fill in the rest");

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostRangeFormattingEndpoint.cs

@@ -83,7 +83,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
         var sourceText = await razorDocument.GetTextAsync(cancellationToken).ConfigureAwait(false);
         var htmlChanges = htmlEdits.SelectAsArray(sourceText.GetTextChange);
 
-        var csharpSyntaxFormattingOptions = CSharpFormatter.GetCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services, csharpSyntaxFormattingOptions: null);
+        var csharpSyntaxFormattingOptions = CSharpFormattingOptionsHelper.GetCSharpSyntaxFormattingOptions(razorDocument.Project.Solution.Services, csharpSyntaxFormattingOptions: null);
         var options = RazorFormattingOptions.From(
             request.Options,
             _clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine,

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/InlayHints/CohostInlayHintResolveEndpoint.cs

@@ -59,7 +59,7 @@ internal class CohostInlayHintResolveEndpoint(
 
         var hint = await _remoteServiceInvoker.TryInvokeAsync<IRemoteInlayHintService, InlayHint>(
            razorDocument.Project.Solution,
-           (service, solutionInfo, cancellationToken) => service.ResolveHintAsync(solutionInfo, razorDocument.Id, request, cancellationToken),
+           (service, solutionInfo, cancellationToken) => service.ResolveHintAsync(solutionInfo, razorDocument.Id, request, razorData.InDeclDocument, cancellationToken),
            cancellationToken).ConfigureAwait(false);
 
         if (hint is null)

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs

@@ -447,6 +447,7 @@ static string GetArgumentTypesLogString(VSInternalCompletionItem resolvedComplet
         var formattedTextChange = await formattingService.TryGetCSharpSnippetFormattingEditAsync(
             documentContext,
             changes,
+            declarationDocument: false, // PROTOTYPE(sonic): Pass in the right value to this
             options,
             cancellationToken).ConfigureAwait(false);
 

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorEditService.cs

@@ -28,6 +28,7 @@ internal interface IRazorEditService
     Task<ImmutableArray<RazorTextChange>> MapCSharpEditsAsync(
         ImmutableArray<RazorTextChange> textChanges,
         IDocumentSnapshot snapshot,
+        bool declarationDocument,
         bool includeCSharpLanguageFeatureEdits,
         Func<RazorTextChange, bool>? directlyMappedEditFilter,
         CancellationToken cancellationToken);

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RazorCodeDocumentExtensions.cs

@@ -1,11 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
 
@@ -48,23 +50,28 @@ public static SourceText GetCSharpSourceText(this RazorCodeDocument document)
     /// keeps the behavior conservative.
     /// </remarks>
     public static RazorCSharpDocument GetCSharpDocumentForHintName(this RazorCodeDocument document, string hintName)
-    {
-        return GetCSharpDocumentForHintName(document, hintName, out _);
-    }
-
-    public static RazorCSharpDocument GetCSharpDocumentForHintName(this RazorCodeDocument document, string hintName, out bool isDeclDocument)
     {
         if (hintName.EndsWith(".decl.g.cs", System.StringComparison.Ordinal) &&
             document.GetCSharpDocument(declarationDocument: true) is { } declDocument)
         {
-            isDeclDocument = true;
             return declDocument;
         }
 
-        isDeclDocument = false;
         return document.GetRequiredCSharpDocument(declarationDocument: false);
     }
 
+    public static bool TryGetCSharpDocumentForGeneratedUri(this RazorCodeDocument codeDocument, Solution solution, Uri generatedDocumentUri, [NotNullWhen(true)] out RazorCSharpDocument? csharpDocument)
+    {
+        if (solution.TryGetSourceGeneratedDocumentIdentity(generatedDocumentUri, out var identity))
+        {
+            csharpDocument = GetCSharpDocumentForHintName(codeDocument, identity.HintName);
+            return true;
+        }
+
+        csharpDocument = null;
+        return false;
+    }
+
     public static SourceText GetHtmlSourceText(this RazorCodeDocument document, CancellationToken cancellationToken)
         => GetCachedData(document).GetOrComputeHtmlDocument(cancellationToken).Text;
 

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/SourceTextExtensions.cs

@@ -370,4 +370,33 @@ public static ImmutableArray<TextChange> GetTextChangesArray(this SourceText new
 
         return list.ToImmutableArray();
     }
+
+    /// <summary>
+    /// Sometimes the Html language server will send back an edit that contains a tilde, because the generated
+    /// document we send them has lots of tildes. In those cases, we need to do some extra work to compute the
+    /// minimal text edits
+    /// </summary>
+    public static TextEdit[] FixHtmlTextEdits(this SourceText htmlSourceText, TextEdit[] edits)
+    {
+        // Avoid computing a minimal diff if we don't need to
+        if (!edits.Any(static e => e.NewText.Contains('~')))
+            return edits;
+
+        var changes = edits.SelectAsArray(htmlSourceText.GetTextChange);
+
+        var fixedChanges = htmlSourceText.MinimizeTextChanges(changes);
+        return fixedChanges.SelectAsPlainArray(htmlSourceText.GetTextEdit);
+    }
+
+    public static SumType<TextEdit, AnnotatedTextEdit>[] FixHtmlTextEdits(this SourceText htmlSourceText, SumType<TextEdit, AnnotatedTextEdit>[] edits)
+    {
+        // Avoid computing a minimal diff if we don't need to
+        if (!edits.Any(static e => ((TextEdit)e).NewText.Contains('~')))
+            return edits;
+
+        var changes = edits.SelectAsArray(e => htmlSourceText.GetTextChange((TextEdit)e));
+
+        var fixedChanges = htmlSourceText.MinimizeTextChanges(changes);
+        return fixedChanges.SelectAsPlainArray<TextChange, SumType<TextEdit, AnnotatedTextEdit>>(c => htmlSourceText.GetTextEdit(c));
+    }
 }

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormattingOptionsHelper.cs

@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Options;
+
+namespace Microsoft.CodeAnalysis.Razor.Formatting;
+
+internal static class CSharpFormattingOptionsHelper
+{
+    internal static CSharpSyntaxFormattingOptions GetCSharpSyntaxFormattingOptions(
+        SolutionServices services,
+        CSharpSyntaxFormattingOptions? csharpSyntaxFormattingOptions)
+    {
+        csharpSyntaxFormattingOptions
+            ??= (CSharpSyntaxFormattingOptions)(services.GetService<ILegacyGlobalOptionsWorkspaceService>()?.GetSyntaxFormattingOptions(services.GetLanguageServices(LanguageNames.CSharp))
+                ?? CSharpSyntaxFormattingOptions.Default);
+
+        return csharpSyntaxFormattingOptions;
+    }
+
+    internal static CSharpSyntaxFormattingOptions GetResolvedCSharpSyntaxFormattingOptions(
+        SolutionServices services,
+        RazorFormattingOptions options,
+        CSharpSyntaxFormattingOptions? csharpSyntaxFormattingOptions = null)
+    {
+        csharpSyntaxFormattingOptions = GetCSharpSyntaxFormattingOptions(
+            services,
+            csharpSyntaxFormattingOptions ?? options.CSharpSyntaxFormattingOptions);
+
+        return csharpSyntaxFormattingOptions with
+        {
+            LineFormatting = csharpSyntaxFormattingOptions.LineFormatting with
+            {
+                UseTabs = !options.InsertSpaces,
+                TabSize = options.TabSize,
+                IndentationSize = options.TabSize,
+                NewLine = CSharpSyntaxFormattingOptions.Default.NewLine
+            }
+        };
+    }
+}

src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/IRazorFormattingService.cs

@@ -33,23 +33,27 @@ Task<ImmutableArray<TextChange>> GetCSharpOnTypeFormattingChangesAsync(
       RazorFormattingOptions options,
       int hostDocumentIndex,
       char triggerCharacter,
+      bool declarationDocument,
       CancellationToken cancellationToken);
 
     Task<TextChange?> TryGetSingleCSharpEditAsync(
         DocumentContext documentContext,
         TextChange csharpEdit,
+        bool declarationDocument,
         RazorFormattingOptions options,
         CancellationToken cancellationToken);
 
     Task<TextChange?> TryGetCSharpCodeActionEditAsync(
        DocumentContext documentContext,
        ImmutableArray<TextChange> csharpEdits,
+       bool declarationDocument,
        RazorFormattingOptions options,
        CancellationToken cancellationToken);
 
     Task<TextChange?> TryGetCSharpSnippetFormattingEditAsync(
        DocumentContext documentContext,
        ImmutableArray<TextChange> csharpEdits,
+       bool declarationDocument,
        RazorFormattingOptions options,
        CancellationToken cancellationToken);