Fix wrap with tag helper methods to just operate on a LinePositionSpan

Author: davidwengier

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

@@ -3,6 +3,7 @@
 
 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;
@@ -41,19 +42,21 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(WrapWithTagParams reques
 
         var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
 
-        var validationResult = await WrapWithTagHelper.ValidateAndAdjustRangeAsync(codeDocument, request.Range, cancellationToken).ConfigureAwait(false);
-        if (!validationResult.IsValid)
+        if (request.Range is null)
         {
-            _logger.LogInformation($"Unsupported language at the requested range.");
+            _logger.LogInformation($"WrapWithTag request for {request.TextDocument.DocumentUri} has a null range.");
             return null;
         }
 
-        // Update the request range if it was adjusted
-        if (validationResult.AdjustedRange is not null)
+        if (!WrapWithTagHelper.TryGetValidWrappingRange(codeDocument, request.Range.ToLinePositionSpan(), out var adjustedRange))
         {
-            request.Range = validationResult.AdjustedRange;
+            _logger.LogInformation($"Unsupported language at the requested range.");
+            return null;
         }
 
+        // Update the request range if it was adjusted
+        request.Range = adjustedRange.ToRange();
+
         cancellationToken.ThrowIfCancellationRequested();
 
         var versioned = new VersionedTextDocumentIdentifier

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

@@ -1,32 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
-using Roslyn.LanguageServer.Protocol;
 
 namespace Microsoft.CodeAnalysis.Razor.Workspaces.Utilities;
 
 internal static class WrapWithTagHelper
 {
-    public static async Task<bool> IsValidWrappingRangeAsync(RazorCodeDocument codeDocument, LinePositionSpan range, CancellationToken cancellationToken)
+    /// <summary>
+    /// Returns the range to use for wrapping a selection with a tag.
+    /// </summary>
+    /// <returns>Returns null if the range specified is not valid</returns>
+    public static bool TryGetValidWrappingRange(RazorCodeDocument codeDocument, LinePositionSpan range, out LinePositionSpan wrappingRange)
     {
-        var result = await ValidateAndAdjustRangeInternalAsync(codeDocument, range, cancellationToken).ConfigureAwait(false);
-        return result.IsValid;
-    }
+        wrappingRange = range;
 
-    public static async Task<(bool IsValid, LspRange? AdjustedRange)> ValidateAndAdjustRangeAsync(RazorCodeDocument codeDocument, LspRange range, CancellationToken cancellationToken)
-    {
         var sourceText = codeDocument.Source.Text;
 
-        if (range?.Start is not { } start ||
-            !sourceText.TryGetAbsoluteIndex(start, out var hostDocumentIndex))
+        if (!sourceText.TryGetAbsoluteIndex(range.Start, out var hostDocumentIndex))
         {
-            return (false, null);
+            return false;
         }
 
         // First thing we do is make sure we start at a non-whitespace character. This is important because in some
@@ -38,20 +34,15 @@ public static async Task<bool> IsValidWrappingRangeAsync(RazorCodeDocument codeD
         //
         // Limiting this to only whitespace on the same line, as it's not clear what user expectation would be otherwise.
         var requestSpan = sourceText.GetTextSpan(range);
-        var adjustedRange = range;
         if (sourceText.TryGetFirstNonWhitespaceOffset(requestSpan, out var offset, out var newLineCount) &&
             newLineCount == 0)
         {
-            adjustedRange = new LspRange
-            {
-                Start = new Position
-                {
-                    Line = range.Start.Line,
-                    Character = range.Start.Character + offset
-                },
-                End = range.End
-            };
-            requestSpan = sourceText.GetTextSpan(adjustedRange);
+            wrappingRange = new LinePositionSpan(
+                start: new LinePosition(
+                    line: range.Start.Line,
+                    character: range.Start.Character + offset),
+                end: range.End);
+            requestSpan = sourceText.GetTextSpan(wrappingRange);
             hostDocumentIndex += offset;
         }
 
@@ -89,29 +80,22 @@ public static async Task<bool> IsValidWrappingRangeAsync(RazorCodeDocument codeD
             //
             // <p>[|@currentCount|]</p>
 
-            var tree = codeDocument.GetSyntaxTree();
-            var node = tree.Root.FindNode(requestSpan, includeWhitespace: false, getInnermostNodeForTie: true);
+            var root = codeDocument.GetRequiredSyntaxRoot();
+            var node = root.FindNode(requestSpan, includeWhitespace: false, getInnermostNodeForTie: true);
             if (node?.FirstAncestorOrSelf<CSharpImplicitExpressionSyntax>() is { Parent: CSharpCodeBlockSyntax codeBlock } &&
                 (requestSpan == codeBlock.Span || requestSpan.Length == 0))
             {
                 // Pretend we're in Html so the rest of the logic can continue
-                adjustedRange = sourceText.GetRange(codeBlock.Span);
+                wrappingRange = sourceText.GetLinePositionSpan(codeBlock.Span);
                 languageKind = RazorLanguageKind.Html;
             }
         }
 
         if (languageKind is not RazorLanguageKind.Html)
         {
-            return (false, null);
+            return false;
         }
 
-        return (true, adjustedRange);
-    }
-
-    private static async Task<(bool IsValid, LinePositionSpan? AdjustedRange)> ValidateAndAdjustRangeInternalAsync(RazorCodeDocument codeDocument, LinePositionSpan range, CancellationToken cancellationToken)
-    {
-        var lspRange = range.ToRange();
-        var result = await ValidateAndAdjustRangeAsync(codeDocument, lspRange, cancellationToken).ConfigureAwait(false);
-        return (result.IsValid, result.AdjustedRange?.ToLinePositionSpan());
+        return true;
     }
-}
+}

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

@@ -52,7 +52,7 @@ private async ValueTask<Response> IsValidWrapWithTagLocationAsync(
         CancellationToken cancellationToken)
     {
         var codeDocument = await context.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var isValid = await WrapWithTagHelper.IsValidWrappingRangeAsync(codeDocument, range, cancellationToken).ConfigureAwait(false);
+        var isValid = WrapWithTagHelper.TryGetValidWrappingRange(codeDocument, range, out var adjustedRange);
         return Response.Results(isValid);
     }