PR Feedback

Author: davidwengier

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs

@@ -3,16 +3,11 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using ICSharpCode.Decompiler.Util;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
-using Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.CodeAnalysis.Razor.Protocol;
-using Microsoft.CodeAnalysis.Razor.Workspaces.Utilities;
-using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Razor.Utilities;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.WrapWithTag;
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Utilities/WrapWithTagHelper.cs

@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.Razor.Workspaces.Utilities;
+namespace Microsoft.CodeAnalysis.Razor.Utilities;
 
 internal static class WrapWithTagHelper
 {
@@ -87,12 +87,9 @@ public static bool TryGetValidWrappingRange(RazorCodeDocument codeDocument, Line
             {
                 // Pretend we're in Html so the rest of the logic can continue
                 wrappingRange = sourceText.GetLinePositionSpan(codeBlock.Span);
-                languageKind = RazorLanguageKind.Html;
+                return true;
             }
-        }
 
-        if (languageKind is not RazorLanguageKind.Html)
-        {
             return false;
         }
 

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/WrapWithTag/RemoteWrapWithTagService.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Razor.Remote;
-using Microsoft.CodeAnalysis.Razor.Workspaces.Utilities;
+using Microsoft.CodeAnalysis.Razor.Utilities;
 using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
 using Response = Microsoft.CodeAnalysis.Razor.Remote.RemoteResponse<Microsoft.CodeAnalysis.Text.LinePositionSpan>;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostWrapWithTagEndpoint.cs

@@ -1,6 +1,7 @@
 // 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.Composition;
 using System.Linq;
 using System.Threading;
@@ -72,7 +73,7 @@ internal sealed class CohostWrapWithTagEndpoint(
 
         // If the Html response has ~s in it, then we need to clean them up.
         if (htmlResponse?.TextEdits is { } edits &&
-            edits.Any(static e => e.NewText.Contains("~")))
+            edits.Any(static e => e.NewText.Contains('~')))
         {
             // To do this we don't actually need to go to OOP, we just need a SourceText with the Html document,
             // and we already have that in a virtual buffer, because it's what the above request was made against.
@@ -90,7 +91,7 @@ internal sealed class CohostWrapWithTagEndpoint(
                 return null;
             }
 
-            var htmlSourceText = SourceText.From(htmlDocument.Snapshot.GetText());
+            var htmlSourceText = htmlDocument.Snapshot.AsText();
             htmlResponse.TextEdits = FormattingUtilities.FixHtmlTextEdits(htmlSourceText, edits);
         }
 

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostWrapWithTagEndpointTest.cs

@@ -198,6 +198,7 @@ private async Task VerifyWrapWithTagAsync(TestCode input, string? expected, VSIn
         if (htmlDocument is not null)
         {
             var snapshot = new StringTextSnapshot(htmlDocument);
+            var buffer = new TestTextBuffer(snapshot);
             var htmlSnapshot = new HtmlVirtualDocumentSnapshot(documentUri, snapshot, hostDocumentSyncVersion: 1, state: null);
             var documentSnapshot = new TestLSPDocumentSnapshot(documentUri, version: 1, htmlSnapshot);
             documentManager.AddDocument(documentUri, documentSnapshot);