Revert document mapping service changes

dotnet · Dec 13, 2023 · 4e63fa5 · 4e63fa5
1 parent b751e89
commit 4e63fa5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentMappingService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentMappingService.cs
@@ -332,19 +332,6 @@ public bool TryMapToHostDocumentPosition(IRazorGeneratedDocument generatedDocume
             return true;
         }
 
-        foreach (var mapping in generatedDocument.GeneratedOnlyMappings)
-        {
-            var generatedAbsoluteIndex = mapping.AbsoluteIndex;
-            var distanceIntoGeneratedSpan = generatedDocumentIndex - generatedAbsoluteIndex;
-            if (generatedAbsoluteIndex <= generatedDocumentIndex &&
-                distanceIntoGeneratedSpan <= mapping.Length)
-            {
-                hostDocumentIndex = 0;
-                hostDocumentPosition = new LinePosition(0, 0);
-                return true;
-            }
-        }
-
         hostDocumentPosition = default;
         hostDocumentIndex = default;
         return false;

diff --git a/...or/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs b/...or/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs
@@ -159,14 +159,10 @@ private async Task AddCSharpSpellCheckRangesAsync(List<SpellCheckRange> ranges,
 
                 // We need to map the start index to produce results, and we validate that we can map the end index so we don't have
                 // squiggles that go from C# into Razor/Html.
-                if (_documentMappingService.TryMapToHostDocumentPosition(csharpDocument, absoluteCSharpStartIndex, out var _1, out var hostDocumentStartIndex) &&
-                    _documentMappingService.TryMapToHostDocumentPosition(csharpDocument, absoluteCSharpStartIndex + length, out var _2, out var hostDocumentEndIndex))
+                if (_documentMappingService.TryMapToHostDocumentPosition(csharpDocument, absoluteCSharpStartIndex, out var _1, out var hostDocumentIndex) &&
+                    _documentMappingService.TryMapToHostDocumentPosition(csharpDocument, absoluteCSharpStartIndex + length, out var _2, out var _3))
                 {
-                    var mappedLength = hostDocumentEndIndex - hostDocumentStartIndex;
-                    if (mappedLength > 0)
-                    {
-                        ranges.Add(new(kind, hostDocumentStartIndex, mappedLength));
-                    }
+                    ranges.Add(new(kind, hostDocumentIndex, length));
                 }
 
                 absoluteCSharpStartIndex += length;

diff --git a/...rosoft.AspNetCore.Razor.LanguageServer.Test/DocumentSymbols/DocumentSymbolEndpointTest.cs b/...rosoft.AspNetCore.Razor.LanguageServer.Test/DocumentSymbols/DocumentSymbolEndpointTest.cs
@@ -22,7 +22,7 @@ public class DocumentSymbolEndpointTest(ITestOutputHelper testOutput) : SingleSe
     public Task DocumentSymbols_CSharpMethods()
         => VerifyDocumentSymbolsAsync(
             """
-            {|AspNetCore.test:|}@functions {
+            @functions {
                 private void {|HandleString(string s):HandleString|}(string s)
                 {
                     s += "Hello";