Reuse types

Author: Andrew Hall

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/DynamicFileInfoProvider.cs

@@ -42,16 +42,11 @@ file sealed class LspDynamicFileProvider(IRazorClientLanguageServerManager clien
             requestParams,
             cancellationToken).ConfigureAwait(false);
 
-        if (response.Updates is null)
-        {
-            return null;
-        }
-
         var textDocument = await WorkspaceExtensions.GetTextDocumentAsync(workspace, response.CSharpDocument.Uri, cancellationToken).ConfigureAwait(false);
         var checksum = Convert.FromBase64String(response.Checksum);
         var textLoader = new LspTextChangesTextLoader(
             textDocument,
-            response.Updates,
+            response.Edit,
             checksum,
             response.ChecksumAlgorithm,
             response.SourceEncodingCodePage,

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspTextChangesTextLoader.cs

@@ -1,17 +1,17 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System.Diagnostics;
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.VisualStudioCode.RazorExtension.Services;
 
 internal class LspTextChangesTextLoader(
         TextDocument? document,
-        IEnumerable<RazorDynamicFileUpdate> updates,
+        RazorTextChange change,
         byte[] checksum,
         SourceHashAlgorithm checksumAlgorithm,
         int? codePage,
@@ -21,7 +21,7 @@ internal class LspTextChangesTextLoader(
     private const string ProvideRazorDynamicFileInfoMethodName = "razor/provideDynamicFileInfo";
 
     private readonly TextDocument? _document = document;
-    private readonly IEnumerable<RazorDynamicFileUpdate> _updates = updates;
+    private readonly RazorTextChange _change = change;
     private readonly byte[] _checksum = checksum;
     private readonly SourceHashAlgorithm _checksumAlgorithm = checksumAlgorithm;
     private readonly int? _codePage = codePage;
@@ -37,7 +37,7 @@ public override async Task<TextAndVersion> LoadTextAndVersionAsync(LoadTextOptio
     {
         if (_document is null)
         {
-            var text = UpdateSourceTextWithEdits(_emptySourceText.Value, _updates);
+            var text = _emptySourceText.Value.WithChanges(_change.ToTextChange());
             return TextAndVersion.Create(text, VersionStamp.Default.GetNewerVersion());
         }
 
@@ -47,7 +47,7 @@ public override async Task<TextAndVersion> LoadTextAndVersionAsync(LoadTextOptio
         if (IsSourceTextMatching(sourceText))
         {
             var version = await _document.GetTextVersionAsync(cancellationToken).ConfigureAwait(false);
-            var newText = UpdateSourceTextWithEdits(sourceText, _updates);
+            var newText = sourceText.WithChanges(_change.ToTextChange());
             return TextAndVersion.Create(newText, version.GetNewerVersion());
         }
 
@@ -88,20 +88,7 @@ private async Task<TextAndVersion> GetFullDocumentFromServerAsync(CancellationTo
             },
             cancellationToken).ConfigureAwait(false);
 
-        Debug.Assert(response.Updates?.SingleOrDefault() is not null);
-
-        var text = UpdateSourceTextWithEdits(_emptySourceText.Value, response.Updates);
+        var text = _emptySourceText.Value.WithChanges(response.Edit.ToTextChange());
         return TextAndVersion.Create(text, VersionStamp.Default.GetNewerVersion());
     }
-
-    private static SourceText UpdateSourceTextWithEdits(SourceText sourceText, IEnumerable<RazorDynamicFileUpdate> updates)
-    {
-        foreach (var update in updates)
-        {
-            var changes = update.Edits.Select(e => new TextChange(e.Span.ToTextSpan(), e.NewText));
-            sourceText = sourceText.WithChanges(changes);
-        }
-
-        return sourceText;
-    }
 }

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorProvideDynamicFileResponse.cs

@@ -13,8 +13,8 @@ internal sealed class RazorProvideDynamicFileResponse
     [JsonPropertyName("csharpDocument")]
     public required TextDocumentIdentifier CSharpDocument { get; set; }
 
-    [JsonPropertyName("edits")]
-    public RazorTextChange[]? Edits { get; set; }
+    [JsonPropertyName("edit")]
+    public required RazorTextChange Edit { get; set; }
 
     [JsonPropertyName("checksum")]
     public required string Checksum { get; set; }

src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj

@@ -14,8 +14,4 @@
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common.Tooling\Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="ProjectEngineHost\" />
-  </ItemGroup>
-
 </Project>