Fix endpoint and remote service to do mapping correctly

Plus some file header/footer issues

Author: davidwengier

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteWrapWithTagService.cs

@@ -1,4 +1,4 @@
-// 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;
@@ -10,7 +10,7 @@ namespace Microsoft.CodeAnalysis.Razor.Remote;
 
 internal interface IRemoteWrapWithTagService
 {
-    ValueTask<RemoteResponse<bool>> IsValidWrapWithTagLocationAsync(RazorPinnedSolutionInfoWrapper solutionInfo, DocumentId razorDocumentId, LinePositionSpan range, CancellationToken cancellationToken);
-    
+    ValueTask<RemoteResponse<LinePositionSpan>> GetValidWrappingRangeAsync(RazorPinnedSolutionInfoWrapper solutionInfo, DocumentId razorDocumentId, LinePositionSpan range, CancellationToken cancellationToken);
+
     ValueTask<RemoteResponse<TextEdit[]?>> FixHtmlTextEditsAsync(RazorPinnedSolutionInfoWrapper solutionInfo, DocumentId razorDocumentId, TextEdit[] textEdits, CancellationToken cancellationToken);
-}
+}

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

@@ -1,4 +1,4 @@
-// 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;
@@ -7,12 +7,11 @@
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Remote;
-using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Razor.Workspaces.Utilities;
 using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
-using Response = Microsoft.CodeAnalysis.Razor.Remote.RemoteResponse<bool>;
-using TextEditResponse = Microsoft.CodeAnalysis.Razor.Remote.RemoteResponse<Microsoft.CodeAnalysis.Text.TextEdit[]?>;
+using Response = Microsoft.CodeAnalysis.Razor.Remote.RemoteResponse<Microsoft.CodeAnalysis.Text.LinePositionSpan>;
+using TextEditResponse = Microsoft.CodeAnalysis.Razor.Remote.RemoteResponse<Roslyn.LanguageServer.Protocol.TextEdit[]?>;
 
 namespace Microsoft.CodeAnalysis.Remote.Razor;
 
@@ -24,15 +23,15 @@ protected override IRemoteWrapWithTagService CreateService(in ServiceArgs args)
             => new RemoteWrapWithTagService(in args);
     }
 
-    public ValueTask<Response> IsValidWrapWithTagLocationAsync(
+    public ValueTask<Response> GetValidWrappingRangeAsync(
         RazorPinnedSolutionInfoWrapper solutionInfo,
         DocumentId razorDocumentId,
         LinePositionSpan range,
         CancellationToken cancellationToken)
         => RunServiceAsync(
             solutionInfo,
             razorDocumentId,
-            context => IsValidWrapWithTagLocationAsync(context, range, cancellationToken),
+            context => GetValidWrappingRangeAsync(context, range, cancellationToken),
             cancellationToken);
 
     public ValueTask<TextEditResponse> FixHtmlTextEditsAsync(
@@ -46,14 +45,18 @@ public ValueTask<TextEditResponse> FixHtmlTextEditsAsync(
             context => FixHtmlTextEditsAsync(context, textEdits, cancellationToken),
             cancellationToken);
 
-    private async ValueTask<Response> IsValidWrapWithTagLocationAsync(
+    private async ValueTask<Response> GetValidWrappingRangeAsync(
         RemoteDocumentContext context,
         LinePositionSpan range,
         CancellationToken cancellationToken)
     {
         var codeDocument = await context.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var isValid = WrapWithTagHelper.TryGetValidWrappingRange(codeDocument, range, out var adjustedRange);
-        return Response.Results(isValid);
+        if (WrapWithTagHelper.TryGetValidWrappingRange(codeDocument, range, out var adjustedRange))
+        {
+            return Response.Results(adjustedRange);
+        }
+
+        return Response.NoFurtherHandling;
     }
 
     private async ValueTask<TextEditResponse> FixHtmlTextEditsAsync(
@@ -72,4 +75,4 @@ private async ValueTask<TextEditResponse> FixHtmlTextEditsAsync(
         var fixedEdits = FormattingUtilities.FixHtmlTextEdits(htmlSourceText, textEdits);
         return TextEditResponse.Results(fixedEdits);
     }
-}
+}

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

@@ -1,19 +1,16 @@
-// 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.Collections.Immutable;
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
-using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Remote;
-using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Razor.LanguageClient.WrapWithTag;
-using Roslyn.LanguageServer.Protocol;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
@@ -25,12 +22,10 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 #pragma warning restore RS0030 // Do not use banned APIs
 internal sealed class CohostWrapWithTagEndpoint(
     IRemoteServiceInvoker remoteServiceInvoker,
-    IFilePathService filePathService,
     IHtmlRequestInvoker requestInvoker)
     : AbstractRazorCohostDocumentRequestHandler<VSInternalWrapWithTagParams, VSInternalWrapWithTagResponse?>
 {
     private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
-    private readonly IFilePathService _filePathService = filePathService;
     private readonly IHtmlRequestInvoker _requestInvoker = requestInvoker;
 
     protected override bool MutatesSolutionState => false;
@@ -47,17 +42,19 @@ internal sealed class CohostWrapWithTagEndpoint(
     {
         // First, check if the position is valid for wrap with tag operation through the remote service
         var range = request.Range.ToLinePositionSpan();
-        var isValidLocation = await _remoteServiceInvoker.TryInvokeAsync<IRemoteWrapWithTagService, RemoteResponse<bool>>(
+        var result = await _remoteServiceInvoker.TryInvokeAsync<IRemoteWrapWithTagService, RemoteResponse<LinePositionSpan>>(
             razorDocument.Project.Solution,
-            (service, solutionInfo, cancellationToken) => service.IsValidWrapWithTagLocationAsync(solutionInfo, razorDocument.Id, range, cancellationToken),
+            (service, solutionInfo, cancellationToken) => service.GetValidWrappingRangeAsync(solutionInfo, razorDocument.Id, range, cancellationToken),
             cancellationToken).ConfigureAwait(false);
 
         // If the remote service says it's not a valid location or we should stop handling, return null
-        if (!isValidLocation.Result || isValidLocation.StopHandling)
+        if (result.StopHandling)
         {
             return null;
         }
 
+        request.Range = result.Result.ToRange();
+
         // The location is valid, so delegate to the HTML server
         var htmlResponse = await _requestInvoker.MakeHtmlLspRequestAsync<VSInternalWrapWithTagParams, VSInternalWrapWithTagResponse>(
             razorDocument,
@@ -89,4 +86,4 @@ internal readonly struct TestAccessor(CohostWrapWithTagEndpoint instance)
         public Task<VSInternalWrapWithTagResponse?> HandleRequestAsync(VSInternalWrapWithTagParams request, TextDocument razorDocument, CancellationToken cancellationToken)
             => instance.HandleRequestAsync(request, razorDocument, cancellationToken);
     }
-}
+}