Skip to content

Commit b84d1b9

Browse files
captainsafiacaptainsafia
committed
Add tests for multiple Map calls on one line
1 parent ba53749 commit b84d1b9

File tree

40 files changed

+98
-75
lines changed

40 files changed

+98
-75
lines changed

‎src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
6060
{
6161
using var stringWriter = new StringWriter(CultureInfo.InvariantCulture);
6262
using var codeWriter = new CodeWriter(stringWriter, baseIndent: 2);
63-
codeWriter.WriteLine($$"""[InterceptsLocation(@"{{endpoint.Location.File}}", {{endpoint.Location.LineNumber}}, {{endpoint.Location.CharacterNumber + 1}})]""");
64-
codeWriter.WriteLine($"internal static RouteHandlerBuilder {endpoint.HttpMethod}_{endpoint.Location.LineNumber}(");
63+
codeWriter.WriteLine($$"""[InterceptsLocation(@"{{endpoint.Location.File}}", {{endpoint.Location.LineNumber}}, {{endpoint.Location.CharacterNumber}})]""");
64+
codeWriter.WriteLine($"internal static RouteHandlerBuilder {endpoint.HttpMethod}_{endpoint.Location.LineNumber}_{endpoint.Location.CharacterNumber}(");
6565
codeWriter.Indent++;
6666
codeWriter.WriteLine("this IEndpointRouteBuilder endpoints,");
6767
// MapFallback overloads that only take a delegate do not need a pattern argument

‎src/Http/Http.Extensions/gen/StaticRouteHandler/Model/Endpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private static (string, int, int) GetLocation(IInvocationOperation operation)
146146
var lineNumber = span.StartLinePosition.Line + 1;
147147
// Calculate the character offset to the end of the Map invocation detected
148148
var invocationLength = ((MemberAccessExpressionSyntax)((InvocationExpressionSyntax)operation.Syntax).Expression).Expression.Span.Length;
149-
var characterNumber = span.StartLinePosition.Character + invocationLength + 1;
149+
var characterNumber = span.StartLinePosition.Character + invocationLength + 2;
150150
return (filePath, lineNumber, characterNumber);
151151
}
152152

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)
@@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Http.Generated
182182
}
183183

184184
[InterceptsLocation(@"TestMapActions.cs", 26, 5)]
185-
internal static RouteHandlerBuilder MapGet_26(
185+
internal static RouteHandlerBuilder MapGet_26_5(
186186
this IEndpointRouteBuilder endpoints,
187187
[StringSyntax("Route")] string pattern,
188188
Delegate handler)
@@ -265,7 +265,7 @@ namespace Microsoft.AspNetCore.Http.Generated
265265
}
266266

267267
[InterceptsLocation(@"TestMapActions.cs", 27, 5)]
268-
internal static RouteHandlerBuilder MapGet_27(
268+
internal static RouteHandlerBuilder MapGet_27_5(
269269
this IEndpointRouteBuilder endpoints,
270270
[StringSyntax("Route")] string pattern,
271271
Delegate handler)
@@ -370,7 +370,7 @@ namespace Microsoft.AspNetCore.Http.Generated
370370
}
371371

372372
[InterceptsLocation(@"TestMapActions.cs", 28, 5)]
373-
internal static RouteHandlerBuilder MapGet_28(
373+
internal static RouteHandlerBuilder MapGet_28_5(
374374
this IEndpointRouteBuilder endpoints,
375375
[StringSyntax("Route")] string pattern,
376376
Delegate handler)
@@ -453,7 +453,7 @@ namespace Microsoft.AspNetCore.Http.Generated
453453
}
454454

455455
[InterceptsLocation(@"TestMapActions.cs", 29, 5)]
456-
internal static RouteHandlerBuilder MapGet_29(
456+
internal static RouteHandlerBuilder MapGet_29_5(
457457
this IEndpointRouteBuilder endpoints,
458458
[StringSyntax("Route")] string pattern,
459459
Delegate handler)
@@ -558,7 +558,7 @@ namespace Microsoft.AspNetCore.Http.Generated
558558
}
559559

560560
[InterceptsLocation(@"TestMapActions.cs", 30, 5)]
561-
internal static RouteHandlerBuilder MapGet_30(
561+
internal static RouteHandlerBuilder MapGet_30_5(
562562
this IEndpointRouteBuilder endpoints,
563563
[StringSyntax("Route")] string pattern,
564564
Delegate handler)
@@ -641,7 +641,7 @@ namespace Microsoft.AspNetCore.Http.Generated
641641
}
642642

643643
[InterceptsLocation(@"TestMapActions.cs", 31, 5)]
644-
internal static RouteHandlerBuilder MapGet_31(
644+
internal static RouteHandlerBuilder MapGet_31_5(
645645
this IEndpointRouteBuilder endpoints,
646646
[StringSyntax("Route")] string pattern,
647647
Delegate handler)
@@ -746,7 +746,7 @@ namespace Microsoft.AspNetCore.Http.Generated
746746
}
747747

748748
[InterceptsLocation(@"TestMapActions.cs", 32, 5)]
749-
internal static RouteHandlerBuilder MapGet_32(
749+
internal static RouteHandlerBuilder MapGet_32_5(
750750
this IEndpointRouteBuilder endpoints,
751751
[StringSyntax("Route")] string pattern,
752752
Delegate handler)
@@ -829,7 +829,7 @@ namespace Microsoft.AspNetCore.Http.Generated
829829
}
830830

831831
[InterceptsLocation(@"TestMapActions.cs", 33, 5)]
832-
internal static RouteHandlerBuilder MapGet_33(
832+
internal static RouteHandlerBuilder MapGet_33_5(
833833
this IEndpointRouteBuilder endpoints,
834834
[StringSyntax("Route")] string pattern,
835835
Delegate handler)
@@ -933,7 +933,7 @@ namespace Microsoft.AspNetCore.Http.Generated
933933
}
934934

935935
[InterceptsLocation(@"TestMapActions.cs", 34, 5)]
936-
internal static RouteHandlerBuilder MapGet_34(
936+
internal static RouteHandlerBuilder MapGet_34_5(
937937
this IEndpointRouteBuilder endpoints,
938938
[StringSyntax("Route")] string pattern,
939939
Delegate handler)
@@ -1015,7 +1015,7 @@ namespace Microsoft.AspNetCore.Http.Generated
10151015
}
10161016

10171017
[InterceptsLocation(@"TestMapActions.cs", 35, 5)]
1018-
internal static RouteHandlerBuilder MapGet_35(
1018+
internal static RouteHandlerBuilder MapGet_35_5(
10191019
this IEndpointRouteBuilder endpoints,
10201020
[StringSyntax("Route")] string pattern,
10211021
Delegate handler)
@@ -1119,7 +1119,7 @@ namespace Microsoft.AspNetCore.Http.Generated
11191119
}
11201120

11211121
[InterceptsLocation(@"TestMapActions.cs", 36, 5)]
1122-
internal static RouteHandlerBuilder MapGet_36(
1122+
internal static RouteHandlerBuilder MapGet_36_5(
11231123
this IEndpointRouteBuilder endpoints,
11241124
[StringSyntax("Route")] string pattern,
11251125
Delegate handler)
@@ -1201,7 +1201,7 @@ namespace Microsoft.AspNetCore.Http.Generated
12011201
}
12021202

12031203
[InterceptsLocation(@"TestMapActions.cs", 37, 5)]
1204-
internal static RouteHandlerBuilder MapGet_37(
1204+
internal static RouteHandlerBuilder MapGet_37_5(
12051205
this IEndpointRouteBuilder endpoints,
12061206
[StringSyntax("Route")] string pattern,
12071207
Delegate handler)
@@ -1306,7 +1306,7 @@ namespace Microsoft.AspNetCore.Http.Generated
13061306
}
13071307

13081308
[InterceptsLocation(@"TestMapActions.cs", 38, 5)]
1309-
internal static RouteHandlerBuilder MapGet_38(
1309+
internal static RouteHandlerBuilder MapGet_38_5(
13101310
this IEndpointRouteBuilder endpoints,
13111311
[StringSyntax("Route")] string pattern,
13121312
Delegate handler)
@@ -1389,7 +1389,7 @@ namespace Microsoft.AspNetCore.Http.Generated
13891389
}
13901390

13911391
[InterceptsLocation(@"TestMapActions.cs", 39, 5)]
1392-
internal static RouteHandlerBuilder MapGet_39(
1392+
internal static RouteHandlerBuilder MapGet_39_5(
13931393
this IEndpointRouteBuilder endpoints,
13941394
[StringSyntax("Route")] string pattern,
13951395
Delegate handler)
@@ -1493,7 +1493,7 @@ namespace Microsoft.AspNetCore.Http.Generated
14931493
}
14941494

14951495
[InterceptsLocation(@"TestMapActions.cs", 40, 5)]
1496-
internal static RouteHandlerBuilder MapGet_40(
1496+
internal static RouteHandlerBuilder MapGet_40_5(
14971497
this IEndpointRouteBuilder endpoints,
14981498
[StringSyntax("Route")] string pattern,
14991499
Delegate handler)
@@ -1575,7 +1575,7 @@ namespace Microsoft.AspNetCore.Http.Generated
15751575
}
15761576

15771577
[InterceptsLocation(@"TestMapActions.cs", 41, 5)]
1578-
internal static RouteHandlerBuilder MapGet_41(
1578+
internal static RouteHandlerBuilder MapGet_41_5(
15791579
this IEndpointRouteBuilder endpoints,
15801580
[StringSyntax("Route")] string pattern,
15811581
Delegate handler)
@@ -1680,7 +1680,7 @@ namespace Microsoft.AspNetCore.Http.Generated
16801680
}
16811681

16821682
[InterceptsLocation(@"TestMapActions.cs", 42, 5)]
1683-
internal static RouteHandlerBuilder MapGet_42(
1683+
internal static RouteHandlerBuilder MapGet_42_5(
16841684
this IEndpointRouteBuilder endpoints,
16851685
[StringSyntax("Route")] string pattern,
16861686
Delegate handler)
@@ -1763,7 +1763,7 @@ namespace Microsoft.AspNetCore.Http.Generated
17631763
}
17641764

17651765
[InterceptsLocation(@"TestMapActions.cs", 43, 5)]
1766-
internal static RouteHandlerBuilder MapGet_43(
1766+
internal static RouteHandlerBuilder MapGet_43_5(
17671767
this IEndpointRouteBuilder endpoints,
17681768
[StringSyntax("Route")] string pattern,
17691769
Delegate handler)
@@ -1867,7 +1867,7 @@ namespace Microsoft.AspNetCore.Http.Generated
18671867
}
18681868

18691869
[InterceptsLocation(@"TestMapActions.cs", 44, 5)]
1870-
internal static RouteHandlerBuilder MapGet_44(
1870+
internal static RouteHandlerBuilder MapGet_44_5(
18711871
this IEndpointRouteBuilder endpoints,
18721872
[StringSyntax("Route")] string pattern,
18731873
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapPost_25(
80+
internal static RouteHandlerBuilder MapPost_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)
@@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Http.Generated
169169
}
170170

171171
[InterceptsLocation(@"TestMapActions.cs", 27, 5)]
172-
internal static RouteHandlerBuilder MapPost_27(
172+
internal static RouteHandlerBuilder MapPost_27_5(
173173
this IEndpointRouteBuilder endpoints,
174174
[StringSyntax("Route")] string pattern,
175175
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)

‎src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Http.Generated
7777
private static readonly string[] PatchVerb = new[] { Microsoft.AspNetCore.Http.HttpMethods.Patch };
7878

7979
[InterceptsLocation(@"TestMapActions.cs", 25, 13)]
80-
internal static RouteHandlerBuilder MapGet_25(
80+
internal static RouteHandlerBuilder MapGet_25_13(
8181
this IEndpointRouteBuilder endpoints,
8282
[StringSyntax("Route")] string pattern,
8383
Delegate handler)

0 commit comments

Comments
 (0)