[FUSE] Add some missing runtime source mappings

src/Compiler/Microsoft.AspNetCore.Razor.Language/src/CodeGeneration/RuntimeNodeWriter.cs

@@ -73,6 +73,7 @@ public override void WriteCSharpExpression(CodeRenderingContext context, CSharpE
         {
             if (node.Children[i] is IntermediateToken token && token.IsCSharp)
             {
+                context.AddSourceMappingFor(token);
                 context.CodeWriter.Write(token.Content);
             }
             else
@@ -116,6 +117,7 @@ public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeInt
         {
             if (node.Children[i] is IntermediateToken token && token.IsCSharp)
             {
+                context.AddSourceMappingFor(token);
                 context.CodeWriter.Write(token.Content);
             }
             else
@@ -232,6 +234,7 @@ public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext co
             {
                 if (node.Children[i] is IntermediateToken token && token.IsCSharp)
                 {
+                    context.AddSourceMappingFor(token);
                     context.CodeWriter.Write(token.Content);
                 }
                 else
@@ -295,6 +298,7 @@ public override void WriteCSharpCodeAttributeValue(CodeRenderingContext context,
                         continue;
                     }
 
+                    context.AddSourceMappingFor(token);
                     context.CodeWriter.Write(token.Content);
 
                     if (linePragmaScope != null)

src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs

@@ -119,6 +119,7 @@ public override void WriteCSharpExpression(CodeRenderingContext context, CSharpE
             {
                 if (node.Children[i] is IntermediateToken token && token.IsCSharp)
                 {
+                    context.AddSourceMappingFor(token);
                     WriteCSharpToken(context, token, includeLinePragma: false);
                 }
                 else
@@ -1215,6 +1216,8 @@ private static void WriteCSharpToken(CodeRenderingContext context, IntermediateT
             using (context.CodeWriter.BuildLinePragma(token.Source, context))
             {
                 context.CodeWriter.WritePadding(0, token.Source.Value, context);
+
+                context.AddSourceMappingFor(token);
                 context.CodeWriter.Write(token.Content);
             }
             return;

src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Extensions/DefaultTagHelperTargetExtension.cs

@@ -567,7 +567,7 @@ internal void RenderTagHelperAttributeInline(
         }
         else if (node is IntermediateToken token)
         {
-            if (context.Options.DesignTime && node.Source != null)
+            if (node.Source != null)
             {
                 context.AddSourceMappingFor(node);
             }

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.mappings.txt

@@ -1,4 +1,14 @@
-Source Location: (60:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (767:18,26 [1] )
+|c|
+
+Source Location: (44:0,44 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (953:26,44 [1] )
+|c|
+
+Source Location: (60:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyClass<string> c = new();
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.mappings.txt

@@ -1,4 +1,24 @@
-Source Location: (161:6,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:1,19 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (760:18,19 [4] )
+|true|
+
+Source Location: (112:3,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => { }|
+Generated Location: (938:26,23 [9] )
+|() => { }|
+
+Source Location: (145:4,21 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (1109:34,21 [1] )
+|c|
+
+Source Location: (32:0,32 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (1283:42,32 [1] )
+|c|
+
+Source Location: (161:6,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyClass<string> c = new();
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (42:2,7 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (791:19,26 [1] )
+|c|
+
+Source Location: (42:2,7 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyClass c = new();
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (48:2,7 [68] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|c1 = c2|
+Generated Location: (791:19,26 [7] )
+|c1 = c2|
+
+Source Location: (48:2,7 [68] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyClass c1 = new();
     private MyClass c2 = new();

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.mappings.txt

@@ -1,4 +1,29 @@
-Source Location: (180:7,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (767:18,26 [1] )
+|c|
+
+Source Location: (43:1,13 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => { }|
+Generated Location: (997:26,13 [9] )
+|() => { }|
+
+Source Location: (74:2,19 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (1167:34,19 [4] )
+|true|
+
+Source Location: (131:4,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => { }|
+Generated Location: (1345:42,23 [9] )
+|() => { }|
+
+Source Location: (164:5,21 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (1516:50,21 [1] )
+|c|
+
+Source Location: (180:7,7 [42] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyClass<string> c = new();
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.mappings.txt

@@ -1,4 +1,24 @@
-Source Location: (155:6,7 [51] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (767:18,26 [1] )
+|c|
+
+Source Location: (49:1,19 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|true|
+Generated Location: (928:26,19 [4] )
+|true|
+
+Source Location: (106:3,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => { }|
+Generated Location: (1106:34,23 [9] )
+|() => { }|
+
+Source Location: (139:4,21 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+|c|
+Generated Location: (1277:42,21 [1] )
+|c|
+
+Source Location: (155:6,7 [51] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private readonly MyClass<string> c = new();
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt

@@ -0,0 +1,5 @@
+Source Location: (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml)
+|async (e) => await Task.Delay(10)|
+Generated Location: (1165:32,19 [33] )
+|async (e) => await Task.Delay(10)|
+

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (1163:32,17 [7] )
+|OnClick|
+
+Source Location: (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick(MouseEventArgs e)
     {

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt

@@ -0,0 +1,5 @@
+Source Location: (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+|async () => await Task.Delay(10)|
+Generated Location: (1165:32,19 [32] )
+|async () => await Task.Delay(10)|
+

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|OnClick|
+Generated Location: (1163:32,17 [7] )
+|OnClick|
+
+Source Location: (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Task OnClick()
     {

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (771:18,30 [11] )
+|ParentValue|
+
+Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (54:1,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (771:18,30 [11] )
+|ParentValue|
+
+Source Location: (54:1,7 [89] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public IEnumerable<DateTime> ParentValue { get; set; } = new [] { DateTime.Now };
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (791:19,26 [11] )
+|ParentValue|
+
+Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (771:18,30 [11] )
+|ParentValue|
+
+Source Location: (54:1,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (791:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt

@@ -1,4 +1,9 @@
-Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (895:19,26 [11] )
+|ParentValue|
+
+Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.mappings.txt

@@ -1,4 +1,14 @@
-Source Location: (81:1,7 [82] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (899:19,30 [11] )
+|ParentValue|
+
+Source Location: (62:0,62 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|Update|
+Generated Location: (1349:28,62 [6] )
+|Update|
+
+Source Location: (81:1,7 [82] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.mappings.txt

@@ -1,4 +1,14 @@
-Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (899:19,30 [11] )
+|ParentValue|
+
+Source Location: (62:0,62 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+|() => { }|
+Generated Location: (1349:28,62 [9] )
+|() => { }|
+
+Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.mappings.txt

@@ -1,4 +1,14 @@
-Source Location: (135:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+|ParentValue|
+Generated Location: (899:19,30 [11] )
+|ParentValue|
+
+Source Location: (60:0,60 [62] x:\dir\subdir\Test\TestComponent.cshtml)
+|(value => { ParentValue = value; return Task.CompletedTask; })|
+Generated Location: (1212:28,60 [62] )
+|(value => { ParentValue = value; return Task.CompletedTask; })|
+
+Source Location: (135:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |