Ensure we include the line count and end char index in remapped spans (…

…#9863) (#9887) * Ensure we include the line count and end char index in remapped spans * Make the source span in tests have non-default values to ensure they get mapped too
dotnet · Jan 31, 2024 · 9f6f809 · 9f6f809
1 parent d129813
commit 9f6f809
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/CodeWriterExtensions.cs
@@ -564,7 +564,7 @@ private static SourceSpan RemapFilePathIfNecessary(SourceSpan sourceSpan, CodeRe
             // If you try and use the line pragma in the design time docs to map back to the original file it will fail,
             // as the path isn't actually valid on windows. As a workaround we apply a simple heuristic to switch the
             // paths back when writing out the design time paths.
-            sourceSpan = new SourceSpan(sourceSpan.FilePath.Replace("/", "\\"), sourceSpan.AbsoluteIndex, sourceSpan.LineIndex, sourceSpan.CharacterIndex, sourceSpan.Length);
+            sourceSpan = new SourceSpan(sourceSpan.FilePath.Replace("/", "\\"), sourceSpan.AbsoluteIndex, sourceSpan.LineIndex, sourceSpan.CharacterIndex, sourceSpan.Length, sourceSpan.LineCount, sourceSpan.EndCharacterIndex);
         }
         return sourceSpan;
     }

diff --git a/...piler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs b/...piler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs
@@ -524,7 +524,8 @@ public void LinePragma_Enhanced_Is_Adjusted_On_Windows(string fileName, string e
 
         var node = new CSharpExpressionIntermediateNode()
         {
-            Source = new SourceSpan(fileName, 0, 0, 0, 3),
+            // Create a fake source span, so we can check it correctly maps in the #line below
+            Source = new SourceSpan(fileName, 0, 2, 3, 6, 1, 2),
         };
         var builder = IntermediateNodeBuilder.Create(node);
         builder.Add(new IntermediateToken()
@@ -540,7 +541,7 @@ public void LinePragma_Enhanced_Is_Adjusted_On_Windows(string fileName, string e
             $"""
 
             #nullable restore
-            #line (1,1)-(1,1) 6 "{expectedFileName}"
+            #line (3,4)-(4,3) 6 "{expectedFileName}"
             Write(i++);
 
             #line default
@@ -552,6 +553,7 @@ public void LinePragma_Enhanced_Is_Adjusted_On_Windows(string fileName, string e
             ignoreLineEndingDifferences: true);
     }
 
+
     private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
     {
         var projectEngine = CreateProjectEngine();