From 6013045d338653db4a4e2055a1e55b1e18e1bdbc Mon Sep 17 00:00:00 2001 From: David Wengier Date: Fri, 20 Dec 2024 17:03:31 +1100 Subject: [PATCH 1/9] Create test infra for running all tests on fuse and non-fuse --- .../Fuse/FuseFactAttribute.cs | 14 ++++ .../Fuse/FuseFactDiscoverer.cs | 28 ++++++++ .../Fuse/FuseTestCase.cs | 69 +++++++++++++++++++ .../Fuse/FuseTestContext.cs | 9 +++ .../Fuse/FuseTheoryAttribute.cs | 14 ++++ .../Fuse/FuseTheoryDiscoverer.cs | 26 +++++++ ...rosoft.AspNetCore.Razor.Test.Common.csproj | 4 ++ 7 files changed, 164 insertions(+) create mode 100644 src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs create mode 100644 src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactDiscoverer.cs create mode 100644 src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs create mode 100644 src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestContext.cs create mode 100644 src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs create mode 100644 src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryDiscoverer.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs new file mode 100644 index 00000000000..dabed54e7ca --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs @@ -0,0 +1,14 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using Xunit; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Razor.Test.Common; + +[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] +[XunitTestCaseDiscoverer($"Microsoft.AspNetCore.Razor.Test.Common.{nameof(FuseFactDiscoverer)}", "Microsoft.AspNetCore.Razor.Test.Common")] +internal sealed class FuseFactAttribute : FactAttribute +{ +} diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactDiscoverer.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactDiscoverer.cs new file mode 100644 index 00000000000..b344e94acbc --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactDiscoverer.cs @@ -0,0 +1,28 @@ +// 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.Generic; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Razor.Test.Common; + +internal sealed class FuseFactDiscoverer(IMessageSink diagnosticMessageSink) + : FactDiscoverer(diagnosticMessageSink) +{ + public override IEnumerable Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute) + { + return CreateTestCases(discoveryOptions, testMethod, DiagnosticMessageSink); + } + + public static IEnumerable CreateTestCases(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IMessageSink messageSink, object[]? dataRow = null) + { + yield return CreateTestCase(forceRuntimeCodeGeneration: false); + yield return CreateTestCase(forceRuntimeCodeGeneration: true); + + FuseTestCase CreateTestCase(bool forceRuntimeCodeGeneration) + { + return new FuseTestCase(forceRuntimeCodeGeneration, messageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod, dataRow); + } + } +} diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs new file mode 100644 index 00000000000..fcc4515652f --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs @@ -0,0 +1,69 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.ComponentModel; +using System.Diagnostics; +using System.Threading; +using System.Threading.Tasks; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Razor.Test.Common; + +internal sealed class FuseTestCase : XunitTestCase +{ + private bool _forceRuntimeCodeGeneration; + + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")] + public FuseTestCase() { } + + public FuseTestCase(bool forceRuntimeCodeGeneration, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod, object[]? testMethodArguments = null) + : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments) + { + _forceRuntimeCodeGeneration = forceRuntimeCodeGeneration; + } + + protected override string GetDisplayName(IAttributeInfo factAttribute, string displayName) + { + return base.GetDisplayName(factAttribute, displayName) + (_forceRuntimeCodeGeneration ? " (FUSE)" : ""); + } + + protected override string GetSkipReason(IAttributeInfo factAttribute) + { + if (_forceRuntimeCodeGeneration && TestMethod.TestClass.TestCollection.TestAssembly.Assembly.Name.StartsWith("Microsoft.AspNetCore.Razor.LanguageServer")) + { + return "Language server cannot run FUSE tests"; + } + + return base.GetSkipReason(factAttribute); + } + + public override Task RunAsync(IMessageSink diagnosticMessageSink, IMessageBus messageBus, object[] constructorArguments, ExceptionAggregator aggregator, CancellationTokenSource cancellationTokenSource) + { + Debug.Assert(constructorArguments.Length >= 1 && constructorArguments[0] is FuseTestContext, $"{TestMethod.TestClass.Class.Name}.{TestMethod.Method.Name} uses a formatting test attribute in a class without a FuseTestContext parameter?"); + constructorArguments[0] = new FuseTestContext + { + ForceRuntimeCodeGeneration = _forceRuntimeCodeGeneration + }; + return base.RunAsync(diagnosticMessageSink, messageBus, constructorArguments, aggregator, cancellationTokenSource); + } + + public override void Deserialize(IXunitSerializationInfo data) + { + _forceRuntimeCodeGeneration = data.GetValue(nameof(_forceRuntimeCodeGeneration)); + base.Deserialize(data); + } + + public override void Serialize(IXunitSerializationInfo data) + { + data.AddValue(nameof(_forceRuntimeCodeGeneration), _forceRuntimeCodeGeneration); + base.Serialize(data); + } + + protected override string GetUniqueID() + { + return base.GetUniqueID() + (_forceRuntimeCodeGeneration ? "FUSE" : "NOFUSE"); + } +} diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestContext.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestContext.cs new file mode 100644 index 00000000000..82a6ddd31a4 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestContext.cs @@ -0,0 +1,9 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.AspNetCore.Razor.Test.Common; + +public sealed class FuseTestContext +{ + public required bool ForceRuntimeCodeGeneration { get; init; } +} diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs new file mode 100644 index 00000000000..2ab1a7336bd --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs @@ -0,0 +1,14 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using Xunit; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Razor.Test.Common; + +[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] +[XunitTestCaseDiscoverer($"Microsoft.AspNetCore.Razor.Test.Common.{nameof(FuseTheoryDiscoverer)}", "Microsoft.AspNetCore.Razor.Test.Common")] +internal sealed class FuseTheoryAttribute : TheoryAttribute +{ +} diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryDiscoverer.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryDiscoverer.cs new file mode 100644 index 00000000000..f5cbfc4f1d0 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryDiscoverer.cs @@ -0,0 +1,26 @@ +// 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.Generic; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Razor.Test.Common; + +internal sealed class FuseTheoryDiscoverer(IMessageSink diagnosticMessageSink) + : TheoryDiscoverer(diagnosticMessageSink) +{ + public override IEnumerable Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute) + { + // We have to force pre-enumeration of theories for this discoverer to work correctly. Normally its true in VS, + // but false in command line/CI. Since we're injecting "fake" data rows, we rely on it everywhere. Without this + // set to true, the method below that we override doesn't get called. + discoveryOptions.SetValue("xunit.discovery.PreEnumerateTheories", true); + return base.Discover(discoveryOptions, testMethod, theoryAttribute); + } + + protected override IEnumerable CreateTestCasesForDataRow(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute, object[] dataRow) + { + return FuseFactDiscoverer.CreateTestCases(discoveryOptions, testMethod, DiagnosticMessageSink, dataRow); + } +} diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj index 389e6c60fee..9d437014ddc 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -40,4 +40,8 @@ + + + + From 1a8a188884eb714eb4c16ccea2dc5be66840d8ed Mon Sep 17 00:00:00 2001 From: David Wengier Date: Sat, 21 Dec 2024 10:35:39 +1100 Subject: [PATCH 2/9] Run all cohost tests with FUSE and non-FUSE --- .../Cohost/CohostCodeActionsEndpointTest.cs | 84 ++++++++++--------- .../CohostDocumentCompletionEndpointTest.cs | 49 +++++------ .../CohostDocumentHighlightEndpointTest.cs | 19 +++-- .../CohostDocumentPullDiagnosticsTest.cs | 14 ++-- .../CohostDocumentSpellCheckEndpointTest.cs | 10 ++- .../CohostDocumentSymbolEndpointTest.cs | 9 +- .../CohostFindAllReferencesEndpointTest.cs | 10 ++- .../Cohost/CohostFoldingRangeEndpointTest.cs | 33 ++++---- .../CohostGoToDefinitionEndpointTest.cs | 28 ++++--- .../CohostGoToImplementationEndpointTest.cs | 21 +++-- .../Cohost/CohostHoverEndpointTest.cs | 14 ++-- .../Cohost/CohostInlayHintEndpointTest.cs | 15 ++-- .../CohostInlineCompletionEndpointTest.cs | 10 ++- .../CohostLinkedEditingRangeEndpointTest.cs | 21 +++-- .../Cohost/CohostOnAutoInsertEndpointTest.cs | 47 +++++------ .../CohostOnTypeFormattingEndpointTest.cs | 28 +++---- .../CohostRangeFormattingEndpointTest.cs | 8 +- .../Cohost/CohostRenameEndpointTest.cs | 13 +-- .../CohostSemanticTokensRangeEndpointTest.cs | 9 +- .../Cohost/CohostSignatureHelpEndpointTest.cs | 13 +-- .../CohostTextPresentationEndpointTest.cs | 7 +- .../CohostUriPresentationEndpointTest.cs | 23 ++--- 22 files changed, 265 insertions(+), 220 deletions(-) diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs index f9af34f35cd..d32c5988858 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs @@ -31,9 +31,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostCodeActionsEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostCodeActionsEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task GenerateConstructor() { var input = """ @@ -68,7 +68,7 @@ public Goo() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.GenerateConstructorFromMembers); } - [Fact] + [FuseFact] public async Task UseExpressionBodiedMember() { var input = """ @@ -101,7 +101,7 @@ @using System.Linq await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.UseExpressionBody); } - [Fact] + [FuseFact] public async Task IntroduceLocal() { var input = """ @@ -148,7 +148,7 @@ void M(string[] args) await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.IntroduceVariable); } - [Fact] + [FuseFact] public async Task IntroduceLocal_All() { var input = """ @@ -195,7 +195,7 @@ void M(string[] args) await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.IntroduceVariable, childActionIndex: 1); } - [Fact] + [FuseFact] public async Task ConvertConcatenationToInterpolatedString_CSharpStatement() { var input = """ @@ -213,7 +213,7 @@ public async Task ConvertConcatenationToInterpolatedString_CSharpStatement() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertConcatenationToInterpolatedString); } - [Fact] + [FuseFact] public async Task ConvertConcatenationToInterpolatedString_ExplicitExpression() { var input = """ @@ -227,7 +227,7 @@ public async Task ConvertConcatenationToInterpolatedString_ExplicitExpression() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertConcatenationToInterpolatedString); } - [Fact] + [FuseFact] public async Task ConvertConcatenationToInterpolatedString_CodeBlock() { var input = """ @@ -247,7 +247,7 @@ public async Task ConvertConcatenationToInterpolatedString_CodeBlock() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertConcatenationToInterpolatedString); } - [Fact] + [FuseFact] public async Task ConvertBetweenRegularAndVerbatimInterpolatedString_CodeBlock() { var input = """ @@ -267,7 +267,7 @@ public async Task ConvertBetweenRegularAndVerbatimInterpolatedString_CodeBlock() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimInterpolatedString); } - [Fact] + [FuseFact] public async Task ConvertBetweenRegularAndVerbatimInterpolatedString_CodeBlock2() { var input = """ @@ -287,7 +287,7 @@ public async Task ConvertBetweenRegularAndVerbatimInterpolatedString_CodeBlock2( await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimInterpolatedString); } - [Fact] + [FuseFact] public async Task ConvertBetweenRegularAndVerbatimString_CodeBlock() { var input = """ @@ -307,7 +307,7 @@ public async Task ConvertBetweenRegularAndVerbatimString_CodeBlock() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimString); } - [Fact] + [FuseFact] public async Task ConvertBetweenRegularAndVerbatimString_CodeBlock2() { var input = """ @@ -327,7 +327,7 @@ public async Task ConvertBetweenRegularAndVerbatimString_CodeBlock2() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimString); } - [Fact] + [FuseFact] public async Task ConvertPlaceholderToInterpolatedString_CodeBlock() { var input = """ @@ -347,7 +347,7 @@ public async Task ConvertPlaceholderToInterpolatedString_CodeBlock() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertPlaceholderToInterpolatedString); } - [Fact] + [FuseFact] public async Task ConvertToInterpolatedString_CodeBlock() { var input = """ @@ -367,7 +367,7 @@ public async Task ConvertToInterpolatedString_CodeBlock() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertToInterpolatedString); } - [Fact] + [FuseFact] public async Task AddDebuggerDisplay() { var input = """ @@ -396,7 +396,7 @@ private string GetDebuggerDisplay() await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.AddDebuggerDisplay); } - [Fact] + [FuseFact] public async Task FullyQualify() { var input = """ @@ -416,7 +416,7 @@ public async Task FullyQualify() await VerifyCodeActionAsync(input, expected, "System.Text.StringBuilder"); } - [Fact] + [FuseFact] public async Task FullyQualify_Multiple() { await VerifyCodeActionAsync( @@ -444,7 +444,7 @@ public class StringBuilder childActionIndex: 0); } - [Fact] + [FuseFact] public async Task AddUsing() { var input = """ @@ -465,7 +465,7 @@ @using System.Text await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeFixProviderNames.AddImport); } - [Fact] + [FuseFact] public async Task AddUsing_Typo() { var input = """ @@ -486,7 +486,7 @@ @using System.Text await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeFixProviderNames.AddImport); } - [Fact] + [FuseFact] public async Task AddUsing_WithExisting() { var input = """ @@ -513,7 +513,7 @@ @using System.Text await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeFixProviderNames.AddImport); } - [Fact] + [FuseFact] public async Task GenerateEventHandler_NoCodeBlock() { var input = """ @@ -533,7 +533,7 @@ private void DoesNotExist(MouseEventArgs e) await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task GenerateEventHandler_CodeBlock() { var input = """ @@ -559,7 +559,7 @@ private void DoesNotExist(MouseEventArgs e) await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task GenerateEventHandler_BadCodeBehind() { await VerifyCodeActionAsync( @@ -587,7 +587,7 @@ public partial class NotAComponent codeActionName: WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task GenerateEventHandler_CodeBehind() { await VerifyCodeActionAsync( @@ -626,7 +626,7 @@ private void DoesNotExist(Microsoft.AspNetCore.Components.Web.MouseEventArgs e) codeActionName: WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task GenerateEventHandler_EmptyCodeBehind() { await VerifyCodeActionAsync( @@ -659,7 +659,7 @@ private void DoesNotExist(Microsoft.AspNetCore.Components.Web.MouseEventArgs e) codeActionName: WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task GenerateAsyncEventHandler_NoCodeBlock() { var input = """ @@ -679,7 +679,7 @@ private Task DoesNotExist(MouseEventArgs e) await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Async_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task GenerateAsyncEventHandler_CodeBlock() { var input = """ @@ -705,7 +705,7 @@ private Task DoesNotExist(MouseEventArgs e) await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Async_Event_Handler_Title("DoesNotExist")); } - [Fact] + [FuseFact] public async Task CreateComponentFromTag() { await VerifyCodeActionAsync( @@ -724,7 +724,7 @@ await VerifyCodeActionAsync( (FileUri("Hello.razor"), "")]); } - [Fact] + [FuseFact] public async Task CreateComponentFromTag_Attribute() { await VerifyCodeActionAsync( @@ -743,7 +743,7 @@ await VerifyCodeActionAsync( (FileUri("Hello.razor"), "")]); } - [Fact] + [FuseFact] public async Task ComponentAccessibility_FixCasing() { await VerifyCodeActionAsync( @@ -760,7 +760,7 @@ await VerifyCodeActionAsync( codeActionName: "EditForm"); } - [Fact] + [FuseFact] public async Task ComponentAccessibility_FullyQualify() { await VerifyCodeActionAsync( @@ -777,7 +777,7 @@ await VerifyCodeActionAsync( codeActionName: "Microsoft.AspNetCore.Components.Sections.SectionOutlet"); } - [Fact] + [FuseFact] public async Task ComponentAccessibility_AddUsing() { await VerifyCodeActionAsync( @@ -795,7 +795,7 @@ @using Microsoft.AspNetCore.Components.Sections codeActionName: "@using Microsoft.AspNetCore.Components.Sections"); } - [Fact] + [FuseFact] public async Task ComponentAccessibility_AddUsing_FixTypo() { await VerifyCodeActionAsync( @@ -813,7 +813,7 @@ @using Microsoft.AspNetCore.Components.Sections codeActionName: "SectionOutlet - @using Microsoft.AspNetCore.Components.Sections"); } - [Fact] + [FuseFact] public async Task ExtractToCodeBehind() { await VerifyCodeActionAsync( @@ -843,7 +843,7 @@ public partial class File1 """)]); } - [Fact] + [FuseFact] public async Task ExtractToComponent() { await VerifyCodeActionAsync( @@ -872,7 +872,7 @@ Hello World """)]); } - [Fact] + [FuseFact] public async Task PromoteUsingDirective() { await VerifyCodeActionAsync( @@ -896,7 +896,7 @@ @using System """)]); } - [Fact] + [FuseFact] public async Task PromoteUsingDirective_Indented() { await VerifyCodeActionAsync( @@ -924,7 +924,7 @@ @using System """)]); } - [Fact] + [FuseFact] public async Task PromoteUsingDirective_Mvc() { await VerifyCodeActionAsync( @@ -949,7 +949,7 @@ @using System """)]); } - [Fact] + [FuseFact] public async Task PromoteUsingDirective_ExistingImports() { await VerifyCodeActionAsync( @@ -980,7 +980,7 @@ @using System """)]); } - [Fact] + [FuseFact] public async Task PromoteUsingDirective_ExistingImports_BlankLineAtEnd() { await VerifyCodeActionAsync( @@ -1012,7 +1012,7 @@ @using System """)]); } - [Fact] + [FuseFact] public async Task PromoteUsingDirective_ExistingImports_WhitespaceLineAtEnd() { await VerifyCodeActionAsync( @@ -1046,6 +1046,8 @@ @using System private async Task VerifyCodeActionAsync(TestCode input, string? expected, string codeActionName, int childActionIndex = 0, string? fileKind = null, (string filePath, string contents)[]? additionalFiles = null, (Uri fileUri, string contents)[]? additionalExpectedFiles = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var fileSystem = (RemoteFileSystem)OOPExportProvider.GetExportedValue(); fileSystem.GetTestAccessor().SetFileSystem(new TestFileSystem(additionalFiles)); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs index 685ce73e866..2c49cfe59d6 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs @@ -24,11 +24,10 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostDocumentCompletionEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostDocumentCompletionEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Theory] - [CombinatorialData] - public async Task CSharpInEmptyExplicitStatement(bool fuse) + [FuseFact] + public async Task CSharpInEmptyExplicitStatement() { await VerifyCompletionListAsync( input: """ @@ -45,11 +44,10 @@ The end. InvokeKind = RoslynVSInternalCompletionInvokeKind.Explicit, TriggerKind = RoslynCompletionTriggerKind.Invoked }, - expectedItemLabels: ["var", "char", "DateTime", "Exception"], - fuse: fuse); + expectedItemLabels: ["var", "char", "DateTime", "Exception"]); } - [Fact] + [FuseFact] public async Task CSharpClassesAtTransition() { await VerifyCompletionListAsync( @@ -69,7 +67,7 @@ The end. expectedItemLabels: ["char", "DateTime", "Exception"]); } - [Fact] + [FuseFact] public async Task CSharpClassMembersAtProvisionalCompletion() { await VerifyCompletionListAsync( @@ -89,7 +87,7 @@ The end. expectedItemLabels: ["DaysInMonth", "IsLeapYear", "Now"]); } - [Fact] + [FuseFact] public async Task CSharpClassesInCodeBlock() { await VerifyCompletionListAsync( @@ -111,7 +109,7 @@ The end. expectedItemLabels: ["char", "DateTime", "Exception"]); } - [Fact] + [FuseFact] public async Task CSharpClassMembersInCodeBlock() { await VerifyCompletionListAsync( @@ -138,7 +136,7 @@ The end. expectedItemLabels: ["DaysInMonth", "IsLeapYear", "Now"]); } - [Fact] + [FuseFact] public async Task CSharpOverrideMethods() { await VerifyCompletionListAsync( @@ -161,7 +159,7 @@ The end. } // Tests MarkupTransitionCompletionItemProvider - [Fact] + [FuseFact] public async Task CSharpMarkupTransitionAndTagHelpersInCodeBlock() { await VerifyCompletionListAsync( @@ -188,7 +186,7 @@ The end. expectedItemLabels: ["text", "EditForm", "InputDate"]); } - [Fact] + [FuseFact] public async Task RazorDirectives() { var expectedDirectiveLabels = new string[] @@ -228,7 +226,7 @@ The end. expectedItemLabels: expectedLabels); } - [Fact] + [FuseFact] public async Task ElementNameTagHelpersCompletion() { await VerifyCompletionListAsync( @@ -248,7 +246,7 @@ The end. expectedItemLabels: ["LayoutView", "EditForm", "ValidationMessage"]); } - [Fact] + [FuseFact] public async Task HtmlElementNamesAndTagHelpersCompletion() { await VerifyCompletionListAsync( @@ -269,7 +267,7 @@ The end. delegatedItemLabels: ["div", "h1"]); } - [Fact] + [FuseFact] public async Task HtmlElementDoNotCommitWithSpace() { await VerifyCompletionListAsync( @@ -292,7 +290,7 @@ The end. commitElementsWithSpace: false); } - [Fact] + [FuseFact] public async Task HtmlSnippetsCompletion() { await VerifyCompletionListAsync( @@ -313,7 +311,7 @@ The end. snippetLabels: ["snippet1", "snippet2"]); } - [Fact] + [FuseFact] public async Task HtmlSnippetsCompletion_NotInStartTag() { await VerifyCompletionListAsync( @@ -337,7 +335,7 @@ The end. } // Tests HTML attributes and DirectiveAttributeTransitionCompletionItemProvider - [Fact] + [FuseFact] public async Task HtmlAndDirectiveAttributeTransitionNamesCompletion() { await VerifyCompletionListAsync( @@ -359,7 +357,7 @@ The end. } // Tests HTML attributes and DirectiveAttributeCompletionItemProvider - [Fact] + [FuseFact] public async Task HtmlAndDirectiveAttributeNamesCompletion() { await VerifyCompletionListAsync( @@ -381,7 +379,7 @@ The end. } // Tests HTML attributes and DirectiveAttributeParameterCompletionItemProvider - [Fact] + [FuseFact] public async Task HtmlAndDirectiveAttributeParameterNamesCompletion() { await VerifyCompletionListAsync( @@ -402,7 +400,7 @@ The end. delegatedItemLabels: ["style", "dir"]); } - [Fact] + [FuseFact] public async Task HtmlAttributeNamesAndTagHelpersCompletion() { await VerifyCompletionListAsync( @@ -423,7 +421,7 @@ The end. delegatedItemLabels: ["style", "dir"]); } - [Fact] + [FuseFact] public async Task TagHelperAttributes_NoAutoInsertQuotes_Completion() { await VerifyCompletionListAsync( @@ -453,10 +451,9 @@ private async Task VerifyCompletionListAsync( string[]? delegatedItemCommitCharacters = null, string[]? snippetLabels = null, bool autoInsertAttributeQuotes = true, - bool commitElementsWithSpace = true, - bool fuse = false) + bool commitElementsWithSpace = true) { - UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = fuse }); + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); var document = await CreateProjectAndRazorDocumentAsync(input.Text); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs index 65de7ed10a9..82344070e04 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Threading.Tasks; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Text; @@ -14,9 +15,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostDocumentHighlightEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostDocumentHighlightEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task Local() { var input = """ @@ -32,7 +33,7 @@ public async Task Local() await VerifyDocumentHighlightsAsync(input); } - [Fact] + [FuseFact] public async Task Method() { var input = """ @@ -50,7 +51,7 @@ public async Task Method() await VerifyDocumentHighlightsAsync(input); } - [Fact] + [FuseFact] public async Task AttributeToField() { var input = """ @@ -68,7 +69,7 @@ public async Task AttributeToField() await VerifyDocumentHighlightsAsync(input); } - [Fact] + [FuseFact] public async Task FieldToAttribute() { var input = """ @@ -86,7 +87,7 @@ public async Task FieldToAttribute() await VerifyDocumentHighlightsAsync(input); } - [Fact] + [FuseFact] public async Task Html() { var input = """ @@ -104,7 +105,7 @@ public async Task Html() await VerifyDocumentHighlightsAsync(input, htmlResponse: [new DocumentHighlight()]); } - [Fact] + [FuseFact] public async Task Razor() { var input = """ @@ -124,7 +125,7 @@ public async Task Razor() await VerifyDocumentHighlightsAsync(input); } - [Fact] + [FuseFact] public async Task Inject() { var input = """ @@ -146,6 +147,8 @@ @inject [|IDis$$posable|] Disposable private async Task VerifyDocumentHighlightsAsync(string input, DocumentHighlight[]? htmlResponse = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetPositionAndSpans(input, out var source, out int cursorPosition, out ImmutableArray spans); var document = await CreateProjectAndRazorDocumentAsync(source); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentPullDiagnosticsTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentPullDiagnosticsTest.cs index 335a7e96ecd..750a5b19a6c 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentPullDiagnosticsTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentPullDiagnosticsTest.cs @@ -15,9 +15,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostDocumentPullDiagnosticsTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostDocumentPullDiagnosticsTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public Task CSharp() => VerifyDiagnosticsAsync("""
@@ -31,7 +31,7 @@ public void IJustMetYou() } """); - [Fact] + [FuseFact] public Task Razor() => VerifyDiagnosticsAsync("""
@@ -41,7 +41,7 @@ public Task Razor()
"""); - [Fact] + [FuseFact] public Task Html() { TestCode input = """ @@ -66,7 +66,7 @@ public Task Html() }]); } - [Fact] + [FuseFact] public Task FilterEscapedAtFromCss() { TestCode input = """ @@ -107,7 +107,7 @@ public Task FilterEscapedAtFromCss() }]); } - [Fact] + [FuseFact] public Task CombinedAndNestedDiagnostics() => VerifyDiagnosticsAsync(""" @using System.Threading.Tasks; @@ -137,6 +137,8 @@ public void IJustMetYou() private async Task VerifyDiagnosticsAsync(TestCode input, VSInternalDiagnosticReport[]? htmlResponse = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text, createSeparateRemoteAndLocalWorkspaces: true); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSpellCheckEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSpellCheckEndpointTest.cs index 51c5d3d28a9..56f678f549e 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSpellCheckEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSpellCheckEndpointTest.cs @@ -13,9 +13,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostDocumentSpellCheckEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostDocumentSpellCheckEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task Handle() { var input = """ @@ -52,11 +52,13 @@ Eat more chickin. } """; - await VerifySemanticTokensAsync(input); + await VerifySpellCheckableRangesAsync(input); } - private async Task VerifySemanticTokensAsync(TestCode input) + private async Task VerifySpellCheckableRangesAsync(TestCode input) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSymbolEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSymbolEndpointTest.cs index 2cc98c4c923..de454083d8b 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSymbolEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentSymbolEndpointTest.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Razor; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.LanguageServer.Protocol; @@ -13,9 +14,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostDocumentSymbolEndpointTest(ITestOutputHelper testOutput) : CohostEndpointTestBase(testOutput) +public class CohostDocumentSymbolEndpointTest(FuseTestContext context, ITestOutputHelper testOutput) : CohostEndpointTestBase(testOutput), IClassFixture { - [Theory] + [FuseTheory] [CombinatorialData] public Task DocumentSymbols_CSharpClassWithMethods(bool hierarchical) => VerifyDocumentSymbolsAsync( @@ -42,7 +43,7 @@ class {|SomeProject.File1.C:C|} """, hierarchical); - [Theory] + [FuseTheory] [CombinatorialData] public Task DocumentSymbols_CSharpMethods(bool hierarchical) => VerifyDocumentSymbolsAsync( @@ -68,6 +69,8 @@ public Task DocumentSymbols_CSharpMethods(bool hierarchical) private async Task VerifyDocumentSymbolsAsync(string input, bool hierarchical = false) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetSpans(input, out input, out ImmutableDictionary> spansDict); var document = await CreateProjectAndRazorDocumentAsync(input); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs index 30782a55b00..be2878d73d4 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs @@ -16,9 +16,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostFindAllReferencesEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostFindAllReferencesEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Theory] + [FuseTheory] [CombinatorialData] public Task FindCSharpMember(bool supportsVSExtensions) => VerifyFindAllReferencesAsync(""" @@ -37,7 +37,7 @@ string M() """, supportsVSExtensions); - [Theory] + [FuseTheory] [CombinatorialData] public async Task ComponentAttribute(bool supportsVSExtensions) { @@ -139,7 +139,7 @@ await VerifyFindAllReferencesAsync(input, supportsVSExtensions, (FilePath("SurveyPrompt.razor.g.cs"), surveyPromptGeneratedCode)); } - [Theory] + [FuseTheory] [CombinatorialData] public async Task OtherCSharpFile(bool supportsVSExtensions) { @@ -171,6 +171,8 @@ await VerifyFindAllReferencesAsync(input, supportsVSExtensions, private async Task VerifyFindAllReferencesAsync(TestCode input, bool supportsVSExtensions, params (string fileName, TestCode testCode)[]? additionalFiles) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + UpdateClientLSPInitializationOptions(c => { c.ClientCapabilities.SupportsVisualStudioExtensions = supportsVSExtensions; diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs index 1bfb8b299cd..6f1c02e879d 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Razor; using Microsoft.AspNetCore.Razor.Language; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.LanguageServer.Protocol; @@ -16,9 +17,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostFoldingRangeEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostFoldingRangeEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public Task IfStatements() => VerifyFoldingRangesAsync("""
@@ -39,21 +40,21 @@ Hello World }|] """); - [Fact] + [FuseFact] public Task LockStatement() => VerifyFoldingRangesAsync(""" @lock (new object()) {[| }|] """); - [Fact] + [FuseFact] public Task UsingStatement() => VerifyFoldingRangesAsync(""" @using (new object()) {[| }|] """); - [Fact] + [FuseFact] public Task IfElseStatements() => VerifyFoldingRangesAsync("""
@@ -70,7 +71,7 @@ Goodbye World
"""); - [Fact] + [FuseFact] public Task Usings() => VerifyFoldingRangesAsync(""" @using System[| @@ -85,7 +86,7 @@ @using System.CodeDom|]

hello!

"""); - [Fact] + [FuseFact] public Task CSharpStatement() => VerifyFoldingRangesAsync("""

hello!

@@ -100,7 +101,7 @@ public Task CSharpStatement()

hello!

"""); - [Fact] + [FuseFact] public Task CSharpStatement_Nested() => VerifyFoldingRangesAsync("""

hello!

@@ -119,7 +120,7 @@ public Task CSharpStatement_Nested()

hello!

"""); - [Fact] + [FuseFact] public Task CSharpStatement_NotSingleLine() => VerifyFoldingRangesAsync("""

hello!

@@ -129,7 +130,7 @@ public Task CSharpStatement_NotSingleLine()

hello!

"""); - [Fact] + [FuseFact] public Task CodeBlock() => VerifyFoldingRangesAsync("""

hello!

@@ -141,7 +142,7 @@ public Task CodeBlock()

hello!

"""); - [Fact] + [FuseFact] public Task CodeBlock_Mvc() => VerifyFoldingRangesAsync("""

hello!

@@ -154,7 +155,7 @@ public Task CodeBlock_Mvc() """, fileKind: FileKinds.Legacy); - [Fact] + [FuseFact] public Task Section() => VerifyFoldingRangesAsync("""

hello!

@@ -167,7 +168,7 @@ @section Hello {[| """, fileKind: FileKinds.Legacy); - [Fact] + [FuseFact] public Task Section_Invalid() => VerifyFoldingRangesAsync("""

hello!

@@ -180,7 +181,7 @@ public Task Section_Invalid() """, fileKind: FileKinds.Legacy); - [Fact] + [FuseFact] public Task CSharpCodeInCodeBlocks() => VerifyFoldingRangesAsync("""
@@ -195,7 +196,7 @@ public void M() {[| }|] """); - [Fact] + [FuseFact] public Task HtmlAndCSharp() => VerifyFoldingRangesAsync("""
{|html: @@ -216,6 +217,8 @@ public void M() {[| private async Task VerifyFoldingRangesAsync(string input, string? fileKind = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetSpans(input, out var source, out ImmutableDictionary> spans); var document = await CreateProjectAndRazorDocumentAsync(source, fileKind); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs index f5b8b6e77e3..261e8089c2b 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs @@ -19,9 +19,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostGoToDefinitionEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostGoToDefinitionEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task CSharp_Method() { var input = """ @@ -40,7 +40,7 @@ public async Task CSharp_Method() await VerifyGoToDefinitionAsync(input); } - [Fact] + [FuseFact] public async Task CSharp_Local() { var input = """ @@ -61,7 +61,7 @@ string GetX() await VerifyGoToDefinitionAsync(input); } - [Fact] + [FuseFact] public async Task CSharp_MetadataReference() { var input = """ @@ -87,7 +87,7 @@ public async Task CSharp_MetadataReference() Assert.Contains("public sealed class String", line); } - [Theory] + [FuseTheory] [InlineData("$$IncrementCount")] [InlineData("In$$crementCount")] [InlineData("IncrementCount$$")] @@ -107,7 +107,7 @@ public async Task Attribute_SameFile(string method) await VerifyGoToDefinitionAsync(input, FileKinds.Component); } - [Fact] + [FuseFact] public async Task AttributeValue_BindAfter() { var input = """ @@ -126,7 +126,7 @@ public async Task AttributeValue_BindAfter() await VerifyGoToDefinitionAsync(input, FileKinds.Component); } - [Fact] + [FuseFact] public async Task Component() { TestCode input = """ @@ -171,7 +171,7 @@ public partial class SurveyPrompt : ComponentBase Assert.Equal(range, location.Range); } - [Theory] + [FuseTheory] [InlineData("Ti$$tle")] [InlineData("$$@bind-Title")] [InlineData("@$$bind-Title")] @@ -297,7 +297,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components. Assert.Equal(range, location.Range); } - [Fact] + [FuseFact] public async Task Html() { // This really just validates Uri remapping, the actual response is largely arbitrary @@ -332,8 +332,10 @@ private static string FileName(string projectRelativeFileName) private async Task VerifyGoToDefinitionAsync(TestCode input, string? fileKind = null, SumType? htmlResponse = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text, fileKind); - var result = await GetGoToDefinitionResultAsync(document, input, htmlResponse); + var result = await GetGoToDefinitionResultCoreAsync(document, input, htmlResponse); Assumes.NotNull(result); @@ -351,11 +353,13 @@ private async Task VerifyGoToDefinitionAsync(TestCode input, string? fileKind = private async Task?> GetGoToDefinitionResultAsync( TestCode input, string? fileKind = null, params (string fileName, string contents)[]? additionalFiles) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text, fileKind, additionalFiles); - return await GetGoToDefinitionResultAsync(document, input, htmlResponse: null); + return await GetGoToDefinitionResultCoreAsync(document, input, htmlResponse: null); } - private async Task?> GetGoToDefinitionResultAsync( + private async Task?> GetGoToDefinitionResultCoreAsync( TextDocument document, TestCode input, SumType? htmlResponse) { var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs index 9d887a24d12..05db4e8cc1f 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs @@ -17,9 +17,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostGoToImplementationEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostGoToImplementationEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task CSharp_Method() { var input = """ @@ -40,7 +40,7 @@ public async Task CSharp_Method() await VerifyCSharpGoToImplementationAsync(input); } - [Fact] + [FuseFact] public async Task CSharp_Field() { var input = """ @@ -64,7 +64,7 @@ string GetX() await VerifyCSharpGoToImplementationAsync(input); } - [Fact] + [FuseFact] public async Task CSharp_Multiple() { var input = """ @@ -85,7 +85,7 @@ void M(Ba$$se b) await VerifyCSharpGoToImplementationAsync(input); } - [Fact] + [FuseFact] public async Task Html() { // This really just validates Uri remapping, the actual response is largely arbitrary @@ -119,14 +119,23 @@ public async Task Html() private async Task VerifyCSharpGoToImplementationAsync(TestCode input) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text); var requestInvoker = new TestLSPRequestInvoker(); - await VerifyGoToImplementationResultAsync(input, document, requestInvoker); + await VerifyGoToImplementationResultCoreAsync(input, document, requestInvoker); } private async Task VerifyGoToImplementationResultAsync(TestCode input, TextDocument document, TestLSPRequestInvoker requestInvoker) + { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + + await VerifyGoToImplementationResultCoreAsync(input, document, requestInvoker); + } + + private async Task VerifyGoToImplementationResultCoreAsync(TestCode input, TextDocument document, TestLSPRequestInvoker requestInvoker) { var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs index d9ceeeae60a..07ddb23b70a 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs @@ -16,9 +16,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; using static HoverAssertions; -public class CohostHoverEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostHoverEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task Razor() { TestCode code = """ @@ -53,7 +53,7 @@ await VerifyHoverAsync(code, async (hover, document) => }); } - [Fact] + [FuseFact] public async Task Html() { TestCode code = """ @@ -73,7 +73,7 @@ public async Task Html() await VerifyHoverAsync(code, htmlResponse, h => Assert.Same(htmlResponse, h)); } - [Fact] + [FuseFact] public async Task CSharp() { TestCode code = """ @@ -106,7 +106,7 @@ await VerifyHoverAsync(code, async (hover, document) => }); } - [Fact] + [FuseFact] public async Task ComponentAttribute() { // Component attributes are within HTML but actually map to C#. @@ -147,6 +147,8 @@ await VerifyHoverAsync(code, async (hover, document) => private async Task VerifyHoverAsync(TestCode input, Func verifyHover) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text); var result = await GetHoverResultAsync(document, input); @@ -159,6 +161,8 @@ private async Task VerifyHoverAsync(TestCode input, Func verifyHover) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text); var result = await GetHoverResultAsync(document, input, htmlResponse); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs index 1b81b87ef39..2f53ac09943 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs @@ -7,6 +7,7 @@ using System.Text.Json; using System.Threading.Tasks; using Microsoft.AspNetCore.Razor; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Testing; @@ -18,9 +19,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostInlayHintEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostInlayHintEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public Task InlayHints() => VerifyInlayHintsAsync( input: """ @@ -62,7 +63,7 @@ private void M(string thisIsMyString) """); - [Fact] + [FuseFact] public Task InlayHints_DisplayAllOverride() => VerifyInlayHintsAsync( input: """ @@ -105,7 +106,7 @@ private void M(string thisIsMyString) """, displayAllOverride: true); - [Fact] + [FuseFact] public Task InlayHints_ComponentAttributes() => VerifyInlayHintsAsync( input: """ @@ -128,12 +129,14 @@ public Task InlayHints_ComponentAttributes() """); - [Theory] + [FuseTheory] [InlineData(0, 0, 0, 20)] [InlineData(0, 0, 2, 0)] [InlineData(2, 0, 4, 0)] public async Task InlayHints_InvalidRange(int startLine, int starChar, int endLine, int endChar) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var input = """
"""; @@ -154,6 +157,8 @@ public async Task InlayHints_InvalidRange(int startLine, int starChar, int endLi private async Task VerifyInlayHintsAsync(string input, Dictionary toolTipMap, string output, bool displayAllOverride = false) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetSpans(input, out input, out ImmutableDictionary> spansDict); var document = await CreateProjectAndRazorDocumentAsync(input); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlineCompletionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlineCompletionEndpointTest.cs index 10a3067b911..39227822e58 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlineCompletionEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlineCompletionEndpointTest.cs @@ -24,9 +24,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostInlineCompletionEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostInlineCompletionEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public Task Constructor() => VerifyInlineCompletionAsync( input: """ @@ -49,7 +49,7 @@ public File1() } """); - [Fact] + [FuseFact] public Task Constructor_SmallIndent() => VerifyInlineCompletionAsync( input: """ @@ -73,7 +73,7 @@ public File1() """, tabSize: 2); - [Fact] + [FuseFact] public Task InHtml_DoesNothing() => VerifyInlineCompletionAsync( input: """ @@ -82,6 +82,8 @@ public Task InHtml_DoesNothing() private async Task VerifyInlineCompletionAsync(TestCode input, string? output = null, int tabSize = 4) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text, createSeparateRemoteAndLocalWorkspaces: true); var inputText = await document.GetTextAsync(DisposalToken); var position = inputText.GetLinePosition(input.Position); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs index 865f5101125..13098258736 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs @@ -3,6 +3,7 @@ using System.Collections.Immutable; using System.Threading.Tasks; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Razor.LinkedEditingRange; using Microsoft.CodeAnalysis.Testing; @@ -13,9 +14,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostLinkedEditingRangeEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostLinkedEditingRangeEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Theory] + [FuseTheory] [InlineData("$$PageTitle", "PageTitle")] [InlineData("Page$$Title", "PageTitle")] [InlineData("PageTitle$$", "PageTitle")] @@ -35,7 +36,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Theory] + [FuseTheory] [InlineData("$$div")] [InlineData("di$$v")] [InlineData("div$$")] @@ -54,7 +55,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Theory] + [FuseTheory] [InlineData("$$div")] [InlineData("di$$v")] [InlineData("div$$")] @@ -73,7 +74,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Fact] + [FuseFact] public async Task Html_EndTag_BeforeSlash() { var input = $""" @@ -89,7 +90,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Fact] + [FuseFact] public async Task Html_NotATag() { var input = $""" @@ -105,7 +106,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Fact] + [FuseFact] public async Task Html_NestedTags_Outer() { var input = $""" @@ -123,7 +124,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Fact] + [FuseFact] public async Task Html_NestedTags_Inner() { var input = $""" @@ -141,7 +142,7 @@ The end. await VerifyLinkedEditingRangeAsync(input); } - [Fact] + [FuseFact] public async Task Html_SelfClosingTag() { var input = $""" @@ -158,6 +159,8 @@ The end. private async Task VerifyLinkedEditingRangeAsync(string input) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetPositionAndSpans(input, out input, out int cursorPosition, out ImmutableArray spans); var document = await CreateProjectAndRazorDocumentAsync(input); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs index e6918002146..32b7fac6145 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs @@ -17,9 +17,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostOnAutoInsertEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostOnAutoInsertEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Theory] + [FuseTheory] [InlineData("PageTitle")] [InlineData("div")] [InlineData("text")] @@ -43,7 +43,7 @@ The end. triggerCharacter: ">"); } - [Theory] + [FuseTheory] [InlineData("PageTitle")] [InlineData("div")] [InlineData("text")] @@ -62,7 +62,7 @@ The end. autoClosingTags: false); } - [Fact] + [FuseFact] public async Task AttributeQuotes() { await VerifyOnAutoInsertAsync( @@ -84,9 +84,8 @@ The end. delegatedResponseText: "\"$0\""); } - [Theory] - [CombinatorialData] - public async Task CSharp_OnForwardSlash(bool fuse) + [FuseFact] + public async Task CSharp_OnForwardSlash() { await VerifyOnAutoInsertAsync( input: """ @@ -103,11 +102,10 @@ void TestMethod() {} void TestMethod() {} } """, - triggerCharacter: "/", - fuse: fuse); + triggerCharacter: "/"); } - [Fact] + [FuseFact] public async Task DoNotAutoInsertCSharp_OnForwardSlashWithFormatOnTypeDisabled() { await VerifyOnAutoInsertAsync( @@ -122,9 +120,8 @@ void TestMethod() {} formatOnType: false); } - [Theory] - [CombinatorialData] - public async Task CSharp_OnEnter(bool fuse) + [FuseFact] + public async Task CSharp_OnEnter() { await VerifyOnAutoInsertAsync( input: """ @@ -159,13 +156,11 @@ void TestMethod() } } """, - triggerCharacter: "\n", - fuse: fuse); + triggerCharacter: "\n"); } - [Theory] - [CombinatorialData] - public async Task CSharp_OnEnter_TwoSpaceIndent(bool fuse) + [FuseFact] + public async Task CSharp_OnEnter_TwoSpaceIndent() { await VerifyOnAutoInsertAsync( input: """ @@ -183,13 +178,11 @@ void TestMethod() } """, triggerCharacter: "\n", - tabSize: 2, - fuse: fuse); + tabSize: 2); } - [Theory] - [CombinatorialData] - public async Task CSharp_OnEnter_UseTabs(bool fuse) + [FuseFact] + public async Task CSharp_OnEnter_UseTabs() { const char tab = '\t'; await VerifyOnAutoInsertAsync( @@ -208,8 +201,7 @@ void TestMethod() { } """, triggerCharacter: "\n", - insertSpaces: false, - fuse: fuse); + insertSpaces: false); } private async Task VerifyOnAutoInsertAsync( @@ -220,10 +212,9 @@ private async Task VerifyOnAutoInsertAsync( bool insertSpaces = true, int tabSize = 4, bool formatOnType = true, - bool autoClosingTags = true, - bool fuse = false) + bool autoClosingTags = true) { - UpdateClientInitializationOptions(opt => opt with { ForceRuntimeCodeGeneration = fuse }); + UpdateClientInitializationOptions(opt => opt with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); var document = await CreateProjectAndRazorDocumentAsync(input.Text); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs index 305704c6412..058af4fa280 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs @@ -19,10 +19,10 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; [Collection(HtmlFormattingCollection.Name)] -public class CohostOnTypeFormattingEndpointTest(HtmlFormattingFixture htmlFormattingFixture, ITestOutputHelper testOutputHelper) - : CohostEndpointTestBase(testOutputHelper) +public class CohostOnTypeFormattingEndpointTest(FuseTestContext context, HtmlFormattingFixture htmlFormattingFixture, ITestOutputHelper testOutputHelper) + : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task InvalidTrigger() { await VerifyOnTypeFormattingAsync( @@ -39,7 +39,7 @@ await VerifyOnTypeFormattingAsync( triggerCharacter: 'h'); } - [Fact] + [FuseFact] public async Task CSharp_InvalidTrigger() { await VerifyOnTypeFormattingAsync( @@ -56,9 +56,8 @@ await VerifyOnTypeFormattingAsync( triggerCharacter: '\n'); } - [Theory] - [CombinatorialData] - public async Task CSharp(bool fuse) + [Fact] + public async Task CSharp() { await VerifyOnTypeFormattingAsync( input: """ @@ -71,13 +70,11 @@ await VerifyOnTypeFormattingAsync( if (true) { } } """, - triggerCharacter: '}', - fuse: fuse); + triggerCharacter: '}'); } - [Theory] - [CombinatorialData] - public async Task FormatsSimpleHtmlTag_OnType(bool fuse) + [FuseFact] + public async Task FormatsSimpleHtmlTag_OnType() { await VerifyOnTypeFormattingAsync( input: """ @@ -101,13 +98,12 @@ await VerifyOnTypeFormattingAsync( """, triggerCharacter: ';', - html: true, - fuse: fuse); + html: true); } - private async Task VerifyOnTypeFormattingAsync(TestCode input, string expected, char triggerCharacter, bool html = false, bool fuse = false) + private async Task VerifyOnTypeFormattingAsync(TestCode input, string expected, char triggerCharacter, bool html = false) { - UpdateClientInitializationOptions(opt => opt with { ForceRuntimeCodeGeneration = fuse }); + UpdateClientInitializationOptions(opt => opt with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); var document = await CreateProjectAndRazorDocumentAsync(input.Text); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs index 97b3db3fd79..ce449b4f4f2 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs @@ -19,10 +19,10 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; [Collection(HtmlFormattingCollection.Name)] -public class CohostRangeFormattingEndpointTest(HtmlFormattingFixture htmlFormattingFixture, ITestOutputHelper testOutputHelper) - : CohostEndpointTestBase(testOutputHelper) +public class CohostRangeFormattingEndpointTest(FuseTestContext context, HtmlFormattingFixture htmlFormattingFixture, ITestOutputHelper testOutputHelper) + : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public Task RangeFormatting() => VerifyRangeFormattingAsync( input: """ @@ -102,6 +102,8 @@ private void M(string thisIsMyString) private async Task VerifyRangeFormattingAsync(TestCode input, string expected) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input.Text); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs index 978461b744c..23ab91860d9 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Razor; using Microsoft.AspNetCore.Razor.Language; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Razor; using Microsoft.CodeAnalysis.Testing; @@ -16,9 +17,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostRenameEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostRenameEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public Task CSharp_Method() => VerifyRenamesAsync( input: """ @@ -53,7 +54,7 @@ public string CallThisFunction() The end. """); - [Theory] + [FuseTheory] [InlineData("$$Component")] [InlineData("Com$$ponent")] [InlineData("Component$$")] @@ -110,7 +111,7 @@ The end. """, renames: [("Component.razor", "DifferentName.razor")]); - [Theory] + [FuseTheory] [InlineData("$$Component")] [InlineData("Com$$ponent")] [InlineData("Component$$")] @@ -167,7 +168,7 @@ The end. """, renames: [("Component.razor", "DifferentName.razor")]); - [Fact] + [FuseFact] public Task Mvc() => VerifyRenamesAsync( input: """ @@ -195,6 +196,8 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase private async Task VerifyRenamesAsync(string input, string newName, string expected, string? fileKind = null, (string fileName, string contents)[]? additionalFiles = null, (string oldName, string newName)[]? renames = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetPosition(input, out var source, out var cursorPosition); var document = await CreateProjectAndRazorDocumentAsync(source, fileKind, additionalFiles); var inputText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs index 2b7e7a4ee0d..9b25fe8eb9b 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Razor.LanguageServer.Semantic; using Microsoft.AspNetCore.Razor.PooledObjects; using Microsoft.AspNetCore.Razor.Telemetry; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.Razor.Settings; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.Razor.Settings; @@ -18,9 +19,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostSemanticTokensRangeEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostSemanticTokensRangeEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Theory] + [FuseTheory] [CombinatorialData] public async Task Razor(bool colorBackground, bool precise) { @@ -60,7 +61,7 @@ public void M() await VerifySemanticTokensAsync(input, colorBackground, precise); } - [Theory] + [FuseTheory] [CombinatorialData] public async Task Legacy(bool colorBackground, bool precise) { @@ -90,6 +91,8 @@ @section MySection { private async Task VerifySemanticTokensAsync(string input, bool colorBackground, bool precise, string? fileKind = null, [CallerMemberName] string? testName = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + var document = await CreateProjectAndRazorDocumentAsync(input, fileKind); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs index 8facef4127a..c64e5a779c7 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Razor; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Razor.Settings; using Microsoft.CodeAnalysis.Testing; @@ -15,9 +16,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostSignatureHelpEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostSignatureHelpEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task CSharpMethodCSharp() { var input = """ @@ -36,7 +37,7 @@ void Act() await VerifySignatureHelpAsync(input, "string M1(int i)"); } - [Fact] + [FuseFact] public async Task CSharpMethodInRazor() { var input = """ @@ -50,7 +51,7 @@ public async Task CSharpMethodInRazor() await VerifySignatureHelpAsync(input, "string GetDiv()"); } - [Fact] + [FuseFact] public async Task AutoListParamsOff_Invoked_ReturnsResult() { var input = """ @@ -69,7 +70,7 @@ void Act() await VerifySignatureHelpAsync(input, "string M1(int i)", autoListParams: false, triggerKind: SignatureHelpTriggerKind.Invoked); } - [Fact] + [FuseFact] public async Task AutoListParamsOff_NotInvoked_ReturnsNoResult() { var input = """ @@ -90,6 +91,8 @@ void Act() private async Task VerifySignatureHelpAsync(string input, string expected, bool autoListParams = true, SignatureHelpTriggerKind? triggerKind = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetPosition(input, out input, out var cursorPosition); var document = await CreateProjectAndRazorDocumentAsync(input); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs index ea74eafd7f7..0e76bc53c4c 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See License.txt in the project root for license information. using System.Threading.Tasks; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Testing; using Microsoft.VisualStudio.LanguageServer.Protocol; @@ -10,9 +11,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostTextPresentationEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostTextPresentationEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task HtmlResponse_TranslatesVirtualDocumentUri() { await VerifyUriPresentationAsync( @@ -45,6 +46,8 @@ The end. private async Task VerifyUriPresentationAsync(string input, string text, string? expected, WorkspaceEdit? htmlResponse = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetSpan(input, out input, out var span); var document = await CreateProjectAndRazorDocumentAsync(input); var sourceText = await document.GetTextAsync(DisposalToken); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs index b2dfa448899..20c3a1f0573 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.ExternalAccess.Razor; using Microsoft.CodeAnalysis.Testing; using Microsoft.VisualStudio.LanguageServer.Protocol; @@ -11,9 +12,9 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; -public class CohostUriPresentationEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper) +public class CohostUriPresentationEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [Fact] + [FuseFact] public async Task RandomFile() { await VerifyUriPresentationAsync( @@ -32,7 +33,7 @@ The end. expected: null); } - [Fact] + [FuseFact] public async Task HtmlResponse_TranslatesVirtualDocumentUri() { var siteCssFileUriString = "file:///C:/path/to/site.css"; @@ -66,7 +67,7 @@ The end. expected: htmlTag); } - [Fact] + [FuseFact] public async Task Component() { await VerifyUriPresentationAsync( @@ -95,7 +96,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase expected: ""); } - [Fact] + [FuseFact] public async Task ImportsFile() { await VerifyUriPresentationAsync( @@ -115,7 +116,7 @@ The end. expected: null); } - [Fact] + [FuseFact] public async Task Html_IntoCSharp_NoTag() { var siteCssFileUriString = "file:///C:/path/to/site.css"; @@ -150,7 +151,7 @@ This is a Razor document. expected: null); } - [Fact] + [FuseFact] public async Task Component_IntoCSharp_NoTag() { await VerifyUriPresentationAsync( @@ -178,7 +179,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase expected: null); } - [Fact] + [FuseFact] public async Task Component_WithChildFile() { await VerifyUriPresentationAsync( @@ -209,7 +210,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase expected: ""); } - [Fact] + [FuseFact] public async Task Component_WithChildFile_RazorNotFirst() { await VerifyUriPresentationAsync( @@ -240,7 +241,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase expected: ""); } - [Fact] + [FuseFact] public async Task Component_RequiredParameter() { await VerifyUriPresentationAsync( @@ -277,6 +278,8 @@ public class Component : ComponentBase private async Task VerifyUriPresentationAsync(string input, Uri[] uris, string? expected, WorkspaceEdit? htmlResponse = null, (string fileName, string contents)[]? additionalFiles = null) { + UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); + TestFileMarkupParser.GetSpan(input, out input, out var span); var document = await CreateProjectAndRazorDocumentAsync(input, additionalFiles: additionalFiles); var sourceText = await document.GetTextAsync(DisposalToken); From 21b055b560812a8638f36ab723c00cea7424d124 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 23 Dec 2024 10:38:18 +1100 Subject: [PATCH 3/9] Automatically compile Razor files in tests. This would have been done when we had the source generator branch anyway, and hard coding is a problem now that sometimes we need runtime code-gen --- .../Cohost/CohostEndpointTestBase.cs | 69 ++++++++----- .../CohostFindAllReferencesEndpointTest.cs | 81 +-------------- .../CohostGoToDefinitionEndpointTest.cs | 98 +------------------ .../Cohost/CohostRenameEndpointTest.cs | 27 ----- .../CohostUriPresentationEndpointTest.cs | 47 +-------- .../Cohost/FormattingTestBase.cs | 12 ++- .../RazorComponentDefinitionServiceTest.cs | 17 +--- 7 files changed, 63 insertions(+), 288 deletions(-) diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs index 491362c92ba..92cb2a46e06 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Basic.Reference.Assemblies; using Microsoft.AspNetCore.Razor; @@ -134,7 +135,7 @@ private protected void UpdateClientLSPInitializationOptions(Func composition; - protected Task CreateProjectAndRazorDocumentAsync( + protected async Task CreateProjectAndRazorDocumentAsync( string contents, string? fileKind = null, (string fileName, string contents)[]? additionalFiles = null, @@ -154,7 +155,7 @@ protected Task CreateProjectAndRazorDocumentAsync( var documentId = DocumentId.CreateNewId(projectId, debugName: documentFilePath); var remoteWorkspace = RemoteWorkspaceAccessor.GetWorkspace(); - var remoteDocument = CreateProjectAndRazorDocument(remoteWorkspace, projectId, projectName, documentId, documentFilePath, contents, additionalFiles, inGlobalNamespace); + var remoteDocument = await CreateProjectAndRazorDocumentAsync(remoteWorkspace, projectId, projectName, documentId, documentFilePath, contents, additionalFiles, inGlobalNamespace); if (createSeparateRemoteAndLocalWorkspaces) { @@ -163,7 +164,7 @@ protected Task CreateProjectAndRazorDocumentAsync( // actual solution syncing set up for testing, and don't really use a service broker, but since we also would // expect to never make changes to a workspace, it should be fine to simply create duplicated solutions as part // of test setup. - return CreateLocalProjectAndRazorDocumentAsync( + return await CreateLocalProjectAndRazorDocumentAsync( remoteDocument.Project.Solution, projectId, projectName, @@ -177,7 +178,7 @@ protected Task CreateProjectAndRazorDocumentAsync( // If we're just creating one workspace, then its the remote one and we just return the remote document // and assume that the endpoint under test doesn't need to do anything on the devenv side. This makes it // easier for tests to mutate solutions - return Task.FromResult(remoteDocument); + return remoteDocument; } private async Task CreateLocalProjectAndRazorDocumentAsync( @@ -195,20 +196,7 @@ private async Task CreateLocalProjectAndRazorDocumentAsync( var workspace = TestWorkspace.CreateWithDiagnosticAnalyzers(exportProvider); AddDisposable(workspace); - var razorDocument = CreateProjectAndRazorDocument(workspace, projectId, projectName, documentId, documentFilePath, contents, additionalFiles, inGlobalNamespace); - - // Until the source generator is hooked up, the workspace representing "local" projects doesn't have anything - // to actually compile the Razor to C#, so we just do it now at creation - var solution = razorDocument.Project.Solution; - // We're cheating a bit here and using the remote export provider to get something to do the compilation - var snapshotManager = _exportProvider.AssumeNotNull().GetExportedValue(); - var snapshot = snapshotManager.GetSnapshot(razorDocument); - // Compile the Razor file - var codeDocument = await snapshot.GetGeneratedOutputAsync(forceDesignTimeGeneratedOutput: false, DisposalToken); - // Update the generated doc contents - var generatedDocumentIds = solution.GetDocumentIdsWithFilePath(documentFilePath + CSharpVirtualDocumentSuffix); - solution = solution.WithDocumentText(generatedDocumentIds, codeDocument.GetCSharpSourceText()); - razorDocument = solution.GetAdditionalDocument(documentId).AssumeNotNull(); + var razorDocument = await CreateProjectAndRazorDocumentAsync(workspace, projectId, projectName, documentId, documentFilePath, contents, additionalFiles, inGlobalNamespace); // If we're creating remote and local workspaces, then we'll return the local document, and have to allow // the remote service invoker to map from the local solution to the remote one. @@ -217,7 +205,7 @@ private async Task CreateLocalProjectAndRazorDocumentAsync( return razorDocument; } - private static TextDocument CreateProjectAndRazorDocument(CodeAnalysis.Workspace workspace, ProjectId projectId, string projectName, DocumentId documentId, string documentFilePath, string contents, (string fileName, string contents)[]? additionalFiles, bool inGlobalNamespace) + private async Task CreateProjectAndRazorDocumentAsync(CodeAnalysis.Workspace workspace, ProjectId projectId, string projectName, DocumentId documentId, string documentFilePath, string contents, (string fileName, string contents)[]? additionalFiles, bool inGlobalNamespace) { var projectInfo = ProjectInfo .Create( @@ -243,11 +231,6 @@ private static TextDocument CreateProjectAndRazorDocument(CodeAnalysis.Workspace documentFilePath, SourceText.From(contents), filePath: documentFilePath) - .AddDocument( - DocumentId.CreateNewId(projectId), - name: documentFilePath + CSharpVirtualDocumentSuffix, - SourceText.From(""), - filePath: documentFilePath + CSharpVirtualDocumentSuffix) .AddAdditionalDocument( DocumentId.CreateNewId(projectId), name: TestProjectData.SomeProjectComponentImportFile1.FilePath, @@ -277,7 +260,45 @@ @using Microsoft.AspNetCore.Components.Web } } + // Until the source generator is hooked up, the workspace representing "local" projects doesn't have anything + // to actually compile the Razor to C#, so we just do it now at creation + var snapshotManager = _exportProvider.AssumeNotNull().GetExportedValue(); + solution = await CompileRazorDocumentAsync(snapshotManager, documentId, solution, DisposalToken); + + if (additionalFiles is not null) + { + foreach (var file in additionalFiles) + { + if (Path.GetExtension(file.fileName) is ".cshtml" or ".razor" && + Path.GetFileNameWithoutExtension(file.fileName) is not ("_ViewImports" or "_Imports")) + { + var additionalDocumentId = solution.GetDocumentIdsWithFilePath(file.fileName).Single(); + solution = await CompileRazorDocumentAsync(snapshotManager, additionalDocumentId, solution, DisposalToken); + } + } + } + return solution.GetAdditionalDocument(documentId).AssumeNotNull(); + + static async Task CompileRazorDocumentAsync(RemoteSnapshotManager snapshotManager, DocumentId documentId, Solution solution, CancellationToken cancellationToken) + { + // We're cheating a bit here and using the remote export provider to get something to do the compilation + var razorDocument = solution.GetAdditionalDocument(documentId).AssumeNotNull(); + var snapshot = snapshotManager.GetSnapshot(razorDocument); + // Compile the Razor file + var codeDocument = await snapshot.GetGeneratedOutputAsync(forceDesignTimeGeneratedOutput: false, cancellationToken); + // Update the generated doc contents + var filePath = razorDocument.FilePath + CSharpVirtualDocumentSuffix; + var generatedDocumentIds = solution.GetDocumentIdsWithFilePath(filePath); + if (generatedDocumentIds.Length == 0) + { + var generatedDocumentId = DocumentId.CreateNewId(documentId.ProjectId); + solution = solution.AddDocument(generatedDocumentId, name: filePath, text: SourceText.From(""), filePath: filePath); + generatedDocumentIds = solution.GetDocumentIdsWithFilePath(filePath); + } + + return solution.WithDocumentText(generatedDocumentIds, codeDocument.GetCSharpSourceText()); + } } protected static Uri FileUri(string projectRelativeFileName) diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs index be2878d73d4..5a96f0314a2 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Razor; @@ -57,86 +56,8 @@ @namespace SomeProject } """; - TestCode surveyPromptGeneratedCode = """ - // - #pragma warning disable 1591 - namespace SomeProject - { - #line default - using global::System; - using global::System.Collections.Generic; - using global::System.Linq; - using global::System.Threading.Tasks; - #nullable restore - #line 1 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components; - - #nullable disable - #nullable restore - #line 2 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Authorization; - - #nullable disable - #nullable restore - #line 3 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Forms; - - #nullable disable - #nullable restore - #line 4 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Routing; - - #nullable disable - #nullable restore - #line 5 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Web; - - #line default - #line hidden - #nullable disable - #nullable restore - public partial class SurveyPrompt : global::Microsoft.AspNetCore.Components.ComponentBase - #nullable disable - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((global::System.Action)(() => { - #nullable restore - #line 1 "c:\users\example\src\SomeProject\SurveyPrompt.razor" - global::System.Object __typeHelper = nameof(SomeProject); - - #line default - #line hidden - #nullable disable - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) - { - } - #pragma warning restore 1998 - #nullable restore - #line 6 "c:\users\example\src\SomeProject\SurveyPrompt.razor" - - [Parameter] - public string Title { get; set; } - - #line default - #line hidden - #nullable disable - } - } - #pragma warning restore 1591 - """; - await VerifyFindAllReferencesAsync(input, supportsVSExtensions, - (FilePath("SurveyPrompt.razor"), surveyPrompt), - (FilePath("SurveyPrompt.razor.g.cs"), surveyPromptGeneratedCode)); + (FilePath("SurveyPrompt.razor"), surveyPrompt)); } [FuseTheory] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs index 261e8089c2b..4d27a186266 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs @@ -145,22 +145,8 @@ public async Task Component() } """; - TestCode surveyPromptGeneratedCode = """ - using Microsoft.AspNetCore.Components; - - namespace SomeProject - { - public partial class SurveyPrompt : ComponentBase - { - [Parameter] - public string Title { get; set; } - } - } - """; - var result = await GetGoToDefinitionResultAsync(input, FileKinds.Component, - (FileName("SurveyPrompt.razor"), surveyPrompt.Text), - (FileName("SurveyPrompt.razor.g.cs"), surveyPromptGeneratedCode.Text)); + (FileName("SurveyPrompt.razor"), surveyPrompt.Text)); Assert.NotNull(result.Value.Second); var locations = result.Value.Second; @@ -205,88 +191,8 @@ @namespace SomeProject } """; - #region surveyPromptGeneratedCode - TestCode surveyPromptGeneratedCode = """ - // - #pragma warning disable 1591 - namespace SomeProject - { - #line default - using global::System; - using global::System.Collections.Generic; - using global::System.Linq; - using global::System.Threading.Tasks; - #nullable restore - #line 1 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components; - - #nullable disable - #nullable restore - #line 2 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Authorization; - - #nullable disable - #nullable restore - #line 3 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Forms; - - #nullable disable - #nullable restore - #line 4 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Routing; - - #nullable disable - #nullable restore - #line 5 "c:\users\example\src\SomeProject\_Imports.razor" - using Microsoft.AspNetCore.Components.Web; - - #line default - #line hidden - #nullable disable - #nullable restore - public partial class SurveyPrompt : global::Microsoft.AspNetCore.Components.ComponentBase - #nullable disable - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((global::System.Action)(() => { - #nullable restore - #line 1 "c:\users\example\src\SomeProject\SurveyPrompt.razor" - global::System.Object __typeHelper = nameof(SomeProject); - - #line default - #line hidden - #nullable disable - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) - { - } - #pragma warning restore 1998 - #nullable restore - #line 6 "c:\users\example\src\SomeProject\SurveyPrompt.razor" - - [Parameter] - public string Title { get; set; } - - #line default - #line hidden - #nullable disable - } - } - #pragma warning restore 1591 - """; - #endregion - var result = await GetGoToDefinitionResultAsync(input, FileKinds.Component, - (FileName("SurveyPrompt.razor"), surveyPrompt.Text), - (FileName("SurveyPrompt.razor.g.cs"), surveyPromptGeneratedCode.Text)); + (FileName("SurveyPrompt.razor"), surveyPrompt.Text)); Assert.NotNull(result.Value.Second); var locations = result.Value.Second; diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs index 23ab91860d9..61c2a9813d9 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs @@ -79,15 +79,6 @@ This is a Razor document. The end. """, additionalFiles: [ - // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), - // The above will make the component exist, but the .razor file needs to exist too for Uri presentation (FilePath("Component.razor"), "") ], newName: "DifferentName", @@ -136,15 +127,6 @@ This is a Razor document. The end. """, additionalFiles: [ - // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), - // The above will make the component exist, but the .razor file needs to exist too for Uri presentation (FilePath("Component.razor"), "") ], newName: "DifferentName", @@ -179,15 +161,6 @@ This is a Razor document. The end. """, additionalFiles: [ - // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), - // The above will make the component exist, but the .razor file needs to exist too for Uri presentation (FilePath("Component.razor"), "") ], newName: "DifferentName", diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs index 20c3a1f0573..6c4e6b4328d 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs @@ -81,15 +81,6 @@ This is a Razor document. The end. """, additionalFiles: [ - // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), - // The above will make the component exist, but the .razor file needs to exist too for Uri presentation (FilePath("Component.razor"), "") ], uris: [FileUri("Component.razor")], @@ -109,9 +100,6 @@ This is a Razor document. The end. """, - additionalFiles: [ - (FilePath("_Imports.razor"), "") - ], uris: [FileUri("_Imports.razor")], expected: null); } @@ -166,13 +154,6 @@ This is a Razor document. } """, additionalFiles: [ - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), (FilePath("Component.razor"), "") ], uris: [FileUri("Component.razor")], @@ -193,13 +174,6 @@ This is a Razor document. The end. """, additionalFiles: [ - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), (FilePath("Component.razor"), "") ], uris: [ @@ -224,13 +198,6 @@ This is a Razor document. The end. """, additionalFiles: [ - (FilePath("Component.cs"), """ - namespace SomeProject; - - public class Component : Microsoft.AspNetCore.Components.ComponentBase - { - } - """), (FilePath("Component.razor"), "") ], uris: [ @@ -255,22 +222,18 @@ This is a Razor document. The end. """, additionalFiles: [ - (FilePath("Component.cs"), """ - using Microsoft.AspNetCore.Components; - - namespace SomeProject; - - public class Component : ComponentBase + (FilePath("Component.razor"), + """ + @code { [Parameter] [EditorRequired] public string RequiredParameter { get; set; } - + [Parameter] public string NormalParameter { get; set; } } - """), - (FilePath("Component.razor"), "") + """) ], uris: [FileUri("Component.razor")], expected: """"""); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs index 3014e532032..19b9f9449aa 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs @@ -50,10 +50,14 @@ private protected async Task RunFormattingTestAsync( var document = await CreateProjectAndRazorDocumentAsync(input.Text, fileKind, inGlobalNamespace: inGlobalNamespace); if (!allowDiagnostics) { - // TODO: This doesn't work, but should when the source generator is hooked up - var compilation = await document.Project.GetCompilationAsync(DisposalToken); - var diagnostics = compilation.AssumeNotNull().GetDiagnostics(DisposalToken); - Assert.False(diagnostics.Any(), "Error creating document:" + Environment.NewLine + string.Join(Environment.NewLine, diagnostics)); + //TODO: Tests in LanguageServer have extra components that are not present in this project, like Counter, etc. + // so we can't validate for diagnostics here until we make them the same. Since the test inputs are all + // shared this doesn't really matter while the language server tests are present. + //var snapshotManager = OOPExportProvider.GetExportedValue(); + //var snapshot = snapshotManager.GetSnapshot(document); + //var codeDocument = await snapshot.GetGeneratedOutputAsync(DisposalToken); + //var csharpDocument = codeDocument.GetCSharpDocument(); + //Assert.False(csharpDocument.Diagnostics.Any(), "Error creating document:" + Environment.NewLine + string.Join(Environment.NewLine, csharpDocument.Diagnostics)); } var htmlDocumentPublisher = new HtmlDocumentPublisher(RemoteServiceInvoker, StrictMock.Of(), JoinableTaskContext, LoggerFactory); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/RazorComponentDefinitionServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/RazorComponentDefinitionServiceTest.cs index 2f4dc0c7b95..6933a9c909f 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/RazorComponentDefinitionServiceTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/RazorComponentDefinitionServiceTest.cs @@ -57,21 +57,8 @@ @namespace SomeProject } """; - TestCode surveyPromptGeneratedCode = """ - using Microsoft.AspNetCore.Components; - - namespace SomeProject - { - public partial class SurveyPrompt : ComponentBase - { - [Parameter] - public string Title { get; set; } - } - } - """; - - await VerifyDefinitionAsync(input, surveyPrompt, (FileName("SurveyPrompt.razor"), surveyPrompt.Text), - (FileName("SurveyPrompt.razor.g.cs"), surveyPromptGeneratedCode.Text)); + await VerifyDefinitionAsync(input, surveyPrompt, + (FileName("SurveyPrompt.razor"), surveyPrompt.Text)); } private async Task VerifyDefinitionAsync(TestCode input, TestCode expectedDocument, params (string fileName, string contents)[]? additionalFiles) From 0aff97d6f42dc3afb349f26516f2eff87c9577b5 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 23 Dec 2024 10:43:31 +1100 Subject: [PATCH 4/9] Skip folding range tests due to whitespace differences --- .../Cohost/CohostFoldingRangeEndpointTest.cs | 4 ++-- .../Fuse/FuseFactAttribute.cs | 1 + .../Fuse/FuseTestCase.cs | 5 +++++ .../Fuse/FuseTheoryAttribute.cs | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs index 6f1c02e879d..eb1fa20125d 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFoldingRangeEndpointTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost; public class CohostFoldingRangeEndpointTest(FuseTestContext context, ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper), IClassFixture { - [FuseFact] + [FuseFact(SkipFuse = "https://github.com/dotnet/razor/issues/10860")] public Task IfStatements() => VerifyFoldingRangesAsync("""
@@ -54,7 +54,7 @@ public Task UsingStatement() }|] """); - [FuseFact] + [FuseFact(SkipFuse = "https://github.com/dotnet/razor/issues/10860")] public Task IfElseStatements() => VerifyFoldingRangesAsync("""
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs index dabed54e7ca..a43864c1150 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseFactAttribute.cs @@ -11,4 +11,5 @@ namespace Microsoft.AspNetCore.Razor.Test.Common; [XunitTestCaseDiscoverer($"Microsoft.AspNetCore.Razor.Test.Common.{nameof(FuseFactDiscoverer)}", "Microsoft.AspNetCore.Razor.Test.Common")] internal sealed class FuseFactAttribute : FactAttribute { + public string? SkipFuse { get; set; } } diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs index fcc4515652f..06e4e99d823 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTestCase.cs @@ -37,6 +37,11 @@ protected override string GetSkipReason(IAttributeInfo factAttribute) return "Language server cannot run FUSE tests"; } + if (_forceRuntimeCodeGeneration && factAttribute.GetNamedArgument("SkipFuse") is { } skipReason) + { + return $"Skipping FUSE run: {skipReason}"; + } + return base.GetSkipReason(factAttribute); } diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs index 2ab1a7336bd..b1bfc19f785 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Fuse/FuseTheoryAttribute.cs @@ -11,4 +11,5 @@ namespace Microsoft.AspNetCore.Razor.Test.Common; [XunitTestCaseDiscoverer($"Microsoft.AspNetCore.Razor.Test.Common.{nameof(FuseTheoryDiscoverer)}", "Microsoft.AspNetCore.Razor.Test.Common")] internal sealed class FuseTheoryAttribute : TheoryAttribute { + public string? SkipFuse { get; set; } } From dec3b3ccd0777f7ad83f127280a0f89bcb3ba1f8 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 23 Dec 2024 10:48:03 +1100 Subject: [PATCH 5/9] Skip semantic tokens test on FUSE due to differences --- .../Cohost/CohostSemanticTokensRangeEndpointTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs index 9b25fe8eb9b..8c76f90977d 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs @@ -61,7 +61,7 @@ public void M() await VerifySemanticTokensAsync(input, colorBackground, precise); } - [FuseTheory] + [FuseTheory(SkipFuse = "https://github.com/dotnet/razor/issues/10857 and https://github.com/dotnet/razor/issues/11329")] [CombinatorialData] public async Task Legacy(bool colorBackground, bool precise) { From 115eca92d8c5598dc54766484b4cfb732381a5bd Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 23 Dec 2024 12:08:53 +1100 Subject: [PATCH 6/9] Fix ExtractToCodeBehind tests --- .../Cohost/CohostCodeActionsEndpointTest.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs index d32c5988858..7a719cf8ee5 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs @@ -816,6 +816,13 @@ @using Microsoft.AspNetCore.Components.Sections [FuseFact] public async Task ExtractToCodeBehind() { + // Roslyn uses the first .cs document in a project to work out the "file header", and in these tests that is the + // generated document, so we need to include the auto-generated header in the expected output. In FUSE however, + // there is a #pragma before the comment, so it isn't seen as having a file header. + var fileHeader = context.ForceRuntimeCodeGeneration + ? "" + : $"// {Environment.NewLine}"; + await VerifyCodeActionAsync( input: """
@@ -832,8 +839,8 @@ await VerifyCodeActionAsync( """, codeActionName: WorkspacesSR.ExtractTo_CodeBehind_Title, additionalExpectedFiles: [ - (FileUri("File1.razor.cs"), """ - namespace SomeProject + (FileUri("File1.razor.cs"), $$""" + {{fileHeader}}namespace SomeProject { public partial class File1 { From ec8615f4aceba43625e385d42a9d5812776e5ba7 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 23 Dec 2024 11:38:54 +1100 Subject: [PATCH 7/9] Output semi-colon before switching back to hidden line directives Fixes various "Add Using" tests in FUSE --- ...rPagesWithRouteTemplate_Runtime.codegen.cs | 4 ++-- .../RazorPagesWithoutModel_Runtime.codegen.cs | 4 ++-- .../RazorPages_Runtime.codegen.cs | 4 ++-- .../UsingDirectives_Runtime.codegen.cs | 4 ++-- ...irectiveWithViewImports_Runtime.codegen.cs | 4 ++-- ...onNullableModel_LangNew_Runtime.codegen.cs | 4 ++-- ...NullableModel_LangNew_Runtime.mappings.txt | 4 ++-- ...onNullableModel_LangOld_Runtime.codegen.cs | 4 ++-- ...NullableModel_LangOld_Runtime.mappings.txt | 4 ++-- ...thNullableModel_LangNew_Runtime.codegen.cs | 4 ++-- ...NullableModel_LangNew_Runtime.mappings.txt | 4 ++-- ...thNullableModel_LangOld_Runtime.codegen.cs | 4 ++-- ...NullableModel_LangOld_Runtime.mappings.txt | 4 ++-- ...rPagesWithRouteTemplate_Runtime.codegen.cs | 4 ++-- .../RazorPagesWithoutModel_Runtime.codegen.cs | 4 ++-- .../RazorPages_Runtime.codegen.cs | 4 ++-- ...bleModel_NullableContextEnabled.codegen.cs | 4 ++-- ...eBaseType_NullableContexEnabled.codegen.cs | 4 ++-- ...bleModel_NullableContextEnabled.codegen.cs | 4 ++-- ...Model_NullableContextNotEnabled.codegen.cs | 4 ++-- .../UsingDirectives_Runtime.codegen.cs | 4 ++-- .../CodeGeneration/RuntimeNodeWriterTest.cs | 4 ++-- .../CSharp8_Runtime.codegen.cs | 4 ++-- .../Usings_OutOfOrder_Runtime.codegen.cs | 4 ++-- .../Usings_Runtime.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../ComponentImports/_Imports.codegen.cs | 4 ++-- .../ComponentImports/_Imports.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 20 +++++++++---------- .../UseTestComponent.codegen.cs | 4 ++-- .../UseTestComponent.mappings.txt | 16 +++++++-------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 20 +++++++++---------- .../UseTestComponent.codegen.cs | 4 ++-- .../UseTestComponent.mappings.txt | 16 +++++++-------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 14 ++++++------- .../UseTestComponent.codegen.cs | 4 ++-- .../UseTestComponent.mappings.txt | 16 +++++++-------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 14 ++++++------- .../UseTestComponent.codegen.cs | 4 ++-- .../UseTestComponent.mappings.txt | 12 +++++------ .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 12 +++++------ .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 12 +++++------ .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 12 +++++------ .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../Counter.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 20 +++++++++---------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 10 +++++----- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 18 ++++++++--------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 18 ++++++++--------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 10 +++++----- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../FormName_Nested/TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 10 +++++----- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 2 +- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 12 +++++------ .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 8 ++++---- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 10 +++++----- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 4 ++-- .../InjectDirective/TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 20 +++++++++---------- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 12 +++++------ .../Regression_784/TestComponent.codegen.cs | 4 ++-- .../Regression_784/TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../UsingDirective/TestComponent.codegen.cs | 4 ++-- .../VoidTagName/TestComponent.codegen.cs | 4 ++-- .../VoidTagName/TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 6 +++--- .../TestComponent.codegen.cs | 4 ++-- .../TestComponent.mappings.txt | 12 +++++------ .../CodeGeneration/RuntimeNodeWriter.cs | 7 ++++++- .../Components/ComponentRuntimeNodeWriter.cs | 7 ++++++- .../RazorSourceGeneratorTests.cs | 8 ++++---- .../Folder1_Component1_razor.g.cs | 4 ++-- .../ImportsRazor/Folder1__Imports_razor.g.cs | 4 ++-- .../System__Imports_razor.g.cs | 4 ++-- .../_Imports_razor.g.cs | 4 ++-- 229 files changed, 604 insertions(+), 594 deletions(-) diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs index fe6f956bd90..31078c26688 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs @@ -16,9 +16,9 @@ namespace AspNetCore #line (4,2)-(4,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml" using Microsoft.AspNetCore.Mvc.RazorPages -#line default -#line hidden ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", // language=Route #line (1,7)-(1,15) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml" diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs index 01dda34441a..e6891c13a73 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs @@ -16,9 +16,9 @@ namespace AspNetCore #line (4,2)-(4,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml" using Microsoft.AspNetCore.Mvc.RazorPages -#line default -#line hidden ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"4d4352438ec54cff935ed10c73f4fb4ce0ea8ffc7c46b467007618dead77f960", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")] public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page { diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs index 688b61d131b..5f15963c4dc 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs @@ -16,9 +16,9 @@ namespace AspNetCore #line (5,2)-(5,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml" using Microsoft.AspNetCore.Mvc.RazorPages -#line default -#line hidden ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"676265931c358e22efce0fe9ebd76cc3a7d2a5c12d37384e13aec92aa7667663", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")] public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page { diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs index 00396700c81..570dc0c69ad 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs @@ -27,9 +27,9 @@ namespace AspNetCore #line (4,2)-(4,14) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml" using System -#line default -#line hidden ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"9194971d2fb7908a02b02841f18655ccc0908a204c2fa948e8dc7e947269da86", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")] public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage { diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs index 8f85c2ade57..cf7844218f5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs @@ -15,10 +15,10 @@ namespace AspNetCoreGeneratedDocument #line (1,2)-(1,14) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml" using System -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore #line (2,12)-(2,26) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml" [Serializable] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.codegen.cs index 837e9efb8c7..2521469e138 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"938aa77e05d0524687967a4964c7424054e2f7b837772fe19895341aa7ef5bda", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.mappings.txt index 52ff1c93a63..deb9091fe50 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangNew_Runtime.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (1006:16,0 [19] ) Source Location: (54:4,5 [10] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model.Name| -Generated Location: (2064:36,0 [10] ) +Generated Location: (2072:36,0 [10] ) |Model.Name| Source Location: (78:6,5 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model?.Address| -Generated Location: (2320:46,0 [14] ) +Generated Location: (2328:46,0 [14] ) |Model?.Address| diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.codegen.cs index b67bacef721..3f964eb20f9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"938aa77e05d0524687967a4964c7424054e2f7b837772fe19895341aa7ef5bda", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.mappings.txt index 52ff1c93a63..deb9091fe50 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNonNullableModel_LangOld_Runtime.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (1006:16,0 [19] ) Source Location: (54:4,5 [10] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model.Name| -Generated Location: (2064:36,0 [10] ) +Generated Location: (2072:36,0 [10] ) |Model.Name| Source Location: (78:6,5 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model?.Address| -Generated Location: (2320:46,0 [14] ) +Generated Location: (2328:46,0 [14] ) |Model?.Address| diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.codegen.cs index 10fd07393ce..516f45030bc 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"a0b3df03ac7b0b582a2924ed8f2f85f3df8f906c37a1aa7f1f8255290fbf29a9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.mappings.txt index b51e5531cba..a7f88d1179b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangNew_Runtime.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (1006:16,0 [19] ) Source Location: (55:4,5 [10] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model.Name| -Generated Location: (2064:36,0 [10] ) +Generated Location: (2072:36,0 [10] ) |Model.Name| Source Location: (79:6,5 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model?.Address| -Generated Location: (2320:46,0 [14] ) +Generated Location: (2328:46,0 [14] ) |Model?.Address| diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.codegen.cs index b405118a3ba..925330142fe 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"a0b3df03ac7b0b582a2924ed8f2f85f3df8f906c37a1aa7f1f8255290fbf29a9", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.mappings.txt index b51e5531cba..a7f88d1179b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithNullableModel_LangOld_Runtime.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (1006:16,0 [19] ) Source Location: (55:4,5 [10] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model.Name| -Generated Location: (2064:36,0 [10] ) +Generated Location: (2072:36,0 [10] ) |Model.Name| Source Location: (79:6,5 [14] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml) |Model?.Address| -Generated Location: (2320:46,0 [14] ) +Generated Location: (2328:46,0 [14] ) |Model?.Address| diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs index 635057a1f50..241473d7df9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (4,2)-(4,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml" using Microsoft.AspNetCore.Mvc.RazorPages -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", // language=Route #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs index cdbb3dcea6d..72a0f8198b0 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (4,2)-(4,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml" using Microsoft.AspNetCore.Mvc.RazorPages -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"4d4352438ec54cff935ed10c73f4fb4ce0ea8ffc7c46b467007618dead77f960", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs index 970ed0b25cc..bf446dbfaa8 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (5,2)-(5,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml" using Microsoft.AspNetCore.Mvc.RazorPages -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"676265931c358e22efce0fe9ebd76cc3a7d2a5c12d37384e13aec92aa7667663", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNonNullableModel_NullableContextEnabled.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNonNullableModel_NullableContextEnabled.codegen.cs index 53b5a83808f..f18686bd617 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNonNullableModel_NullableContextEnabled.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNonNullableModel_NullableContextEnabled.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"d0420b910fa2a6f0119a96ffb534fee225ca66e96b3b1741cf04c7ebd9525f62", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableBaseType_NullableContexEnabled.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableBaseType_NullableContexEnabled.codegen.cs index 9e9a0ae7aff..d6d419c20ab 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableBaseType_NullableContexEnabled.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableBaseType_NullableContexEnabled.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"714936b16425e1b5a49883c3e910ed43c30422ebc564f54651880695133a3b4b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextEnabled.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextEnabled.codegen.cs index 7b21b6491ee..9a0bc6f8ee4 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextEnabled.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextEnabled.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"b354ee3595811e9701f9c464ddf35ccb31360a3799b7bb4279192f084591a4fe", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextNotEnabled.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextNotEnabled.codegen.cs index 7b21b6491ee..9a0bc6f8ee4 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextNotEnabled.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorView_WithNullableModel_NullableContextNotEnabled.codegen.cs @@ -16,10 +16,10 @@ namespace AspNetCoreGeneratedDocument #line (2,2)-(2,21) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\test.cshtml" using TestNamespace -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"b354ee3595811e9701f9c464ddf35ccb31360a3799b7bb4279192f084591a4fe", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/test.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs index 446661ec6ce..f01aee6e740 100644 --- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs @@ -33,10 +33,10 @@ namespace AspNetCoreGeneratedDocument #line (4,2)-(4,14) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml" using System -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"9194971d2fb7908a02b02841f18655ccc0908a204c2fa948e8dc7e947269da86", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs index d7c1b52e47b..4c974ae82db 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/RuntimeNodeWriterTest.cs @@ -95,10 +95,10 @@ public void WriteUsingDirective_WithSourceAndLineDirectives_WritesContentWithLin #line (1,1)-(1,1) ""test.cshtml"" using System -#line default -#line hidden #nullable disable ; +#line default +#line hidden ", csharp, ignoreLineEndingDifferences: true); diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs index 772e19c2e75..6008f711292 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_Runtime.codegen.cs @@ -15,10 +15,10 @@ namespace AspNetCoreGeneratedDocument #line (1,2)-(1,34) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml" using System.Collections.Generic -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"4c55c366b179d82f3d2800004985646e9bf0edbf993e2f4a94cbb70079823905", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder_Runtime.codegen.cs index e83170d0004..84b585098c2 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder_Runtime.codegen.cs @@ -51,10 +51,10 @@ namespace AspNetCoreGeneratedDocument #line (32,2)-(32,19) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder.cshtml" using System.Text -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"a3144fef15024ccbbb19682bfb110b149c637f2ae64b4499962195e7612ba274", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_OutOfOrder.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs index a3aadbe2792..b11b7cd810b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.codegen.cs @@ -45,10 +45,10 @@ namespace AspNetCoreGeneratedDocument #line (7,2)-(7,43) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml" using static global::System.Text.Encoding -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"f52e72ba69034334ab681d1f5e91cd50788cbfc0d1390104ee1e60d95d4ca443", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml")] [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings.cshtml")] [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute] diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs index 52e92fe690d..4703e7bb49b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs @@ -17,10 +17,10 @@ namespace Test #line (2,2)-(2,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt index 7bfac6f42a9..6269bfc7aec 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt @@ -10,6 +10,6 @@ Generated Location: (468:17,0 [41] ) Source Location: (94:2,19 [33] x:\dir\subdir\Test\TestComponent.cshtml) |async (e) => await Task.Delay(10)| -Generated Location: (1210:34,0 [33] ) +Generated Location: (1218:34,0 [33] ) |async (e) => await Task.Delay(10)| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs index b55c10fac80..14f181b516c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs @@ -17,10 +17,10 @@ namespace Test #line (2,2)-(2,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt index 969a30d5bd3..e5faeb97f0e 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt @@ -10,7 +10,7 @@ Generated Location: (468:17,0 [41] ) Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1210:34,0 [7] ) +Generated Location: (1218:34,0 [7] ) |OnClick| Source Location: (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) @@ -20,7 +20,7 @@ Source Location: (112:3,7 [88] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (1454:45,0 [88] ) +Generated Location: (1462:45,0 [88] ) | Task OnClick(MouseEventArgs e) { diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs index d8153b336d2..b7dfe6f9ddd 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs @@ -17,10 +17,10 @@ namespace Test #line (2,2)-(2,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt index 1a2d0d2e942..3a9400c5f52 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt @@ -10,6 +10,6 @@ Generated Location: (468:17,0 [41] ) Source Location: (94:2,19 [32] x:\dir\subdir\Test\TestComponent.cshtml) |async () => await Task.Delay(10)| -Generated Location: (1210:34,0 [32] ) +Generated Location: (1218:34,0 [32] ) |async () => await Task.Delay(10)| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs index 2e4d6278607..6fe5b74af13 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs @@ -17,10 +17,10 @@ namespace Test #line (2,2)-(2,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt index 829f1b89fd5..6447bc5a7bd 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt @@ -10,7 +10,7 @@ Generated Location: (468:17,0 [41] ) Source Location: (92:2,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1210:34,0 [7] ) +Generated Location: (1218:34,0 [7] ) |OnClick| Source Location: (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) @@ -20,7 +20,7 @@ Source Location: (112:3,7 [72] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (1454:45,0 [72] ) +Generated Location: (1462:45,0 [72] ) | Task OnClick() { diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs index 17967c6a213..35a313f0bfc 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Globalization -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt index a3464fd6e09..f73ee69f03f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementFallback_WithCulture/TestComponent.mappings.txt @@ -5,19 +5,19 @@ Generated Location: (372:12,0 [26] ) Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1026:29,0 [11] ) +Generated Location: (1034:29,0 [11] ) |ParentValue| Source Location: (111:1,82 [28] x:\dir\subdir\Test\TestComponent.cshtml) |CultureInfo.InvariantCulture| -Generated Location: (1197:37,0 [28] ) +Generated Location: (1205:37,0 [28] ) |CultureInfo.InvariantCulture| Source Location: (152:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "hi"; | -Generated Location: (1739:50,0 [55] ) +Generated Location: (1747:50,0 [55] ) | public string ParentValue { get; set; } = "hi"; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs index 19dacac2551..9816e1d985c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Globalization -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt index 7124aca567d..53d22556437 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElementWithCulture/TestComponent.mappings.txt @@ -5,19 +5,19 @@ Generated Location: (372:12,0 [26] ) Source Location: (48:1,19 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1028:29,0 [11] ) +Generated Location: (1036:29,0 [11] ) |ParentValue| Source Location: (115:1,86 [28] x:\dir\subdir\Test\TestComponent.cshtml) |CultureInfo.InvariantCulture| -Generated Location: (1199:37,0 [28] ) +Generated Location: (1207:37,0 [28] ) |CultureInfo.InvariantCulture| Source Location: (156:2,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "hi"; | -Generated Location: (1747:50,0 [55] ) +Generated Location: (1755:50,0 [55] ) | public string ParentValue { get; set; } = "hi"; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs index e025bc7eb74..762e05482f3 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Globalization -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt index 6109615cda9..ef18909e426 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture/TestComponent.mappings.txt @@ -5,14 +5,14 @@ Generated Location: (372:12,0 [26] ) Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1086:30,0 [11] ) +Generated Location: (1094:30,0 [11] ) |ParentValue| Source Location: (121:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } | -Generated Location: (1576:43,0 [44] ) +Generated Location: (1584:43,0 [44] ) | public int ParentValue { get; set; } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs index 03aed57c00a..b0b4a171632 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Globalization -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt index 20f17a3527b..8d94696b780 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToInputElementWithDefaultCulture_Override/TestComponent.mappings.txt @@ -5,19 +5,19 @@ Generated Location: (372:12,0 [26] ) Source Location: (64:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1086:30,0 [11] ) +Generated Location: (1094:30,0 [11] ) |ParentValue| Source Location: (131:1,102 [26] x:\dir\subdir\Test\TestComponent.cshtml) |CultureInfo.CurrentCulture| -Generated Location: (1258:38,0 [26] ) +Generated Location: (1266:38,0 [26] ) |CultureInfo.CurrentCulture| Source Location: (170:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } | -Generated Location: (1800:51,0 [44] ) +Generated Location: (1808:51,0 [44] ) | public int ParentValue { get; set; } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs index 737d2eff464..77346c87556 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt index c157fb0a16a..dfa111ce4c7 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputText_CanOverrideEvent/TestComponent.mappings.txt @@ -5,14 +5,14 @@ Generated Location: (372:12,0 [41] ) Source Location: (59:1,15 [11] x:\dir\subdir\Test\TestComponent.cshtml) |CurrentDate| -Generated Location: (1043:29,0 [11] ) +Generated Location: (1051:29,0 [11] ) |CurrentDate| Source Location: (126:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | -Generated Location: (1562:42,0 [77] ) +Generated Location: (1570:42,0 [77] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs index f07d812a71e..0f8569f0047 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt index e98510c4d07..1ded453bc1a 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BuiltIn_BindToInputWithSuffix/TestComponent.mappings.txt @@ -5,14 +5,14 @@ Generated Location: (372:12,0 [41] ) Source Location: (65:1,21 [11] x:\dir\subdir\Test\TestComponent.cshtml) |CurrentDate| -Generated Location: (1043:29,0 [11] ) +Generated Location: (1051:29,0 [11] ) |CurrentDate| Source Location: (116:2,7 [77] x:\dir\subdir\Test\TestComponent.cshtml) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | -Generated Location: (1563:42,0 [77] ) +Generated Location: (1571:42,0 [77] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs index cbe78938552..727a5b8bff4 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs @@ -12,9 +12,9 @@ namespace Test #line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml" using Models; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt index 3c77ca98a96..a363850614d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [13] ) Source Location: (57:2,39 [30] x:\dir\subdir\Test\TestComponent.cshtml) |Array.Empty()| -Generated Location: (980:28,0 [30] ) +Generated Location: (988:28,0 [30] ) |Array.Empty()| Source Location: (144:4,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) |FieldName| -Generated Location: (2323:56,0 [9] ) +Generated Location: (2331:56,0 [9] ) |FieldName| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs index 57b1d874238..bef9b4f69ca 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs @@ -12,9 +12,9 @@ namespace Test #line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml" using Models; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt index 94706cf9c3d..fbd9f9b5f4d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [13] ) Source Location: (55:1,39 [30] x:\dir\subdir\Test\TestComponent.cshtml) |Array.Empty()| -Generated Location: (980:28,0 [30] ) +Generated Location: (988:28,0 [30] ) |Array.Empty()| Source Location: (142:3,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) |FieldName| -Generated Location: (2339:56,0 [9] ) +Generated Location: (2347:56,0 [9] ) |FieldName| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs index 5f71b00a1a0..55503c40666 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs @@ -12,9 +12,9 @@ namespace Test #line (1,2)-(1,50) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Rendering; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt index 4063f3c8f7d..625e2ec6820 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (372:12,0 [48] ) Source Location: (55:2,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) | RenderChildComponent(__builder); | -Generated Location: (879:26,0 [34] ) +Generated Location: (887:26,0 [34] ) | RenderChildComponent(__builder); | Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (101:4,7 [69] x:\dir\subdir\Test\TestComponent.cshtml) void RenderChildComponent(RenderTreeBuilder __builder) { | -Generated Location: (1096:36,0 [69] ) +Generated Location: (1104:36,0 [69] ) | void RenderChildComponent(RenderTreeBuilder __builder) { @@ -22,7 +22,7 @@ Generated Location: (1096:36,0 [69] ) Source Location: (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (1398:48,0 [7] ) +Generated Location: (1406:48,0 [7] ) | } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs index 64114fb1a0c..640af7a3e18 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs @@ -12,9 +12,9 @@ namespace Test #line (1,2)-(1,51) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.RenderTree; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt index 2608c1ae056..1171bbd3388 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt @@ -8,7 +8,7 @@ Source Location: (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml) void RenderChildComponent() { | -Generated Location: (879:26,0 [42] ) +Generated Location: (887:26,0 [42] ) | void RenderChildComponent() { @@ -17,12 +17,12 @@ Generated Location: (879:26,0 [42] ) Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (1161:38,0 [7] ) +Generated Location: (1169:38,0 [7] ) | } | Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) | RenderChildComponent(); | -Generated Location: (1301:46,0 [25] ) +Generated Location: (1309:46,0 [25] ) | RenderChildComponent(); | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs index 257c697cde8..cb0d3aaa8fb 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt index 8a26f78bd48..4fa8548079e 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt @@ -5,14 +5,14 @@ Generated Location: (372:12,0 [41] ) Source Location: (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1145:29,0 [7] ) +Generated Location: (1153:29,0 [7] ) |OnClick| Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml) | private Action OnClick { get; set; } | -Generated Location: (1391:40,0 [60] ) +Generated Location: (1399:40,0 [60] ) | private Action OnClick { get; set; } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs index 3ad720927d7..11ed60a2dd3 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml" using AnotherTest -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt index d1f38da2d50..137cf9ce65f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [17] ) Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) |context| -Generated Location: (1509:37,0 [7] ) +Generated Location: (1517:37,0 [7] ) |context| Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) |context| -Generated Location: (2455:59,0 [7] ) +Generated Location: (2463:59,0 [7] ) |context| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs index 463a195dab3..f788ff6a26f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs @@ -18,10 +18,10 @@ namespace Test #line (2,2)-(2,25) "x:\dir\subdir\Test\_Imports.razor" using System.Reflection -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))] #nullable restore public partial class _Imports : object diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt index f82b0533170..c7a05ab1cdd 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt @@ -10,6 +10,6 @@ Generated Location: (488:18,0 [23] ) Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) |Foo| -Generated Location: (945:35,0 [3] ) +Generated Location: (953:35,0 [3] ) |Foo| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.codegen.cs index dd30149e455..685fa8c6492 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.codegen.cs @@ -11,9 +11,9 @@ namespace Test #line (1,2)-(1,40) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.mappings.txt index 375777746c4..e43185306c3 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/TestComponent.mappings.txt @@ -5,52 +5,52 @@ Generated Location: (320:11,0 [38] ) Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem1| -Generated Location: (556:20,0 [6] ) +Generated Location: (564:20,0 [6] ) |TItem1| Source Location: (92:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem2| -Generated Location: (703:28,0 [6] ) +Generated Location: (711:28,0 [6] ) |TItem2| Source Location: (131:3,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem3| -Generated Location: (850:36,0 [6] ) +Generated Location: (858:36,0 [6] ) |TItem3| Source Location: (59:1,18 [20] x:\dir\subdir\Test\TestComponent.cshtml) |where TItem1 : Image| -Generated Location: (1053:44,0 [20] ) +Generated Location: (1061:44,0 [20] ) |where TItem1 : Image| Source Location: (99:2,18 [19] x:\dir\subdir\Test\TestComponent.cshtml) |where TItem2 : ITag| -Generated Location: (1207:51,0 [19] ) +Generated Location: (1215:51,0 [19] ) |where TItem2 : ITag| Source Location: (138:3,18 [27] x:\dir\subdir\Test\TestComponent.cshtml) |where TItem3 : Image, new()| -Generated Location: (1360:58,0 [27] ) +Generated Location: (1368:58,0 [27] ) |where TItem3 : Image, new()| Source Location: (186:6,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item2 in Items2) { | -Generated Location: (1788:71,0 [34] ) +Generated Location: (1796:71,0 [34] ) |foreach (var item2 in Items2) { | Source Location: (234:9,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item2)| -Generated Location: (2039:82,0 [19] ) +Generated Location: (2047:82,0 [19] ) |ChildContent(item2)| Source Location: (266:11,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (2304:92,0 [3] ) +Generated Location: (2312:92,0 [3] ) |} | @@ -61,7 +61,7 @@ Source Location: (294:15,7 [236] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public TItem3 Item3 { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } | -Generated Location: (2550:103,0 [236] ) +Generated Location: (2558:103,0 [236] ) | [Parameter] public TItem1 Item1 { get; set; } [Parameter] public List Items2 { get; set; } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs index 59eb0f730e6..46cfb029942 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\UseTestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class UseTestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt index 1016f505fdf..89aa34ddc67 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt @@ -5,22 +5,22 @@ Generated Location: (375:12,0 [10] ) Source Location: (35:1,22 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |item1| -Generated Location: (964:28,0 [5] ) +Generated Location: (972:28,0 [5] ) |item1| Source Location: (49:1,36 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |items| -Generated Location: (1125:36,0 [5] ) +Generated Location: (1133:36,0 [5] ) |items| Source Location: (62:1,49 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |item1| -Generated Location: (1286:44,0 [5] ) +Generated Location: (1294:44,0 [5] ) |item1| Source Location: (78:2,8 [7] x:\dir\subdir\Test\UseTestComponent.cshtml) |context| -Generated Location: (1568:54,0 [7] ) +Generated Location: (1576:54,0 [7] ) |context| Source Location: (118:5,7 [268] x:\dir\subdir\Test\UseTestComponent.cshtml) @@ -30,7 +30,7 @@ Source Location: (118:5,7 [268] x:\dir\subdir\Test\UseTestComponent.cshtml) static Tag tag2 = new Tag() { description = "Another description."}; List items = new List() { tag1, tag2 }; | -Generated Location: (1855:67,0 [268] ) +Generated Location: (1863:67,0 [268] ) | Image item1 = new Image() { id = 1, url="https://example.com"}; static Tag tag1 = new Tag() { description = "A description."}; @@ -40,16 +40,16 @@ Generated Location: (1855:67,0 [268] ) Source Location: (28:1,15 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |Item1| -Generated Location: (3090:93,0 [5] ) +Generated Location: (3098:93,0 [5] ) |Item1| Source Location: (41:1,28 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |Items2| -Generated Location: (3361:102,0 [6] ) +Generated Location: (3369:102,0 [6] ) |Items2| Source Location: (55:1,42 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |Item3| -Generated Location: (3633:111,0 [5] ) +Generated Location: (3641:111,0 [5] ) |Item3| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.codegen.cs index dd30149e455..685fa8c6492 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.codegen.cs @@ -11,9 +11,9 @@ namespace Test #line (1,2)-(1,40) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.mappings.txt index be183220ffd..ba9beec1123 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/TestComponent.mappings.txt @@ -5,52 +5,52 @@ Generated Location: (320:11,0 [38] ) Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem1| -Generated Location: (556:20,0 [6] ) +Generated Location: (564:20,0 [6] ) |TItem1| Source Location: (93:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem2| -Generated Location: (703:28,0 [6] ) +Generated Location: (711:28,0 [6] ) |TItem2| Source Location: (133:3,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem3| -Generated Location: (850:36,0 [6] ) +Generated Location: (858:36,0 [6] ) |TItem3| Source Location: (59:1,18 [20] x:\dir\subdir\Test\TestComponent.cshtml) |where TItem1 : Image| -Generated Location: (1053:44,0 [20] ) +Generated Location: (1061:44,0 [20] ) |where TItem1 : Image| Source Location: (100:2,18 [19] x:\dir\subdir\Test\TestComponent.cshtml) |where TItem2 : ITag| -Generated Location: (1207:51,0 [19] ) +Generated Location: (1215:51,0 [19] ) |where TItem2 : ITag| Source Location: (140:3,18 [27] x:\dir\subdir\Test\TestComponent.cshtml) |where TItem3 : Image, new()| -Generated Location: (1360:58,0 [27] ) +Generated Location: (1368:58,0 [27] ) |where TItem3 : Image, new()| Source Location: (189:6,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item2 in Items2) { | -Generated Location: (1788:71,0 [34] ) +Generated Location: (1796:71,0 [34] ) |foreach (var item2 in Items2) { | Source Location: (237:9,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item2)| -Generated Location: (2039:82,0 [19] ) +Generated Location: (2047:82,0 [19] ) |ChildContent(item2)| Source Location: (269:11,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (2304:92,0 [3] ) +Generated Location: (2312:92,0 [3] ) |} | @@ -61,7 +61,7 @@ Source Location: (297:15,7 [236] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public TItem3 Item3 { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } | -Generated Location: (2550:103,0 [236] ) +Generated Location: (2558:103,0 [236] ) | [Parameter] public TItem1 Item1 { get; set; } [Parameter] public List Items2 { get; set; } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs index 59eb0f730e6..46cfb029942 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\UseTestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class UseTestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt index 1016f505fdf..89aa34ddc67 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt @@ -5,22 +5,22 @@ Generated Location: (375:12,0 [10] ) Source Location: (35:1,22 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |item1| -Generated Location: (964:28,0 [5] ) +Generated Location: (972:28,0 [5] ) |item1| Source Location: (49:1,36 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |items| -Generated Location: (1125:36,0 [5] ) +Generated Location: (1133:36,0 [5] ) |items| Source Location: (62:1,49 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |item1| -Generated Location: (1286:44,0 [5] ) +Generated Location: (1294:44,0 [5] ) |item1| Source Location: (78:2,8 [7] x:\dir\subdir\Test\UseTestComponent.cshtml) |context| -Generated Location: (1568:54,0 [7] ) +Generated Location: (1576:54,0 [7] ) |context| Source Location: (118:5,7 [268] x:\dir\subdir\Test\UseTestComponent.cshtml) @@ -30,7 +30,7 @@ Source Location: (118:5,7 [268] x:\dir\subdir\Test\UseTestComponent.cshtml) static Tag tag2 = new Tag() { description = "Another description."}; List items = new List() { tag1, tag2 }; | -Generated Location: (1855:67,0 [268] ) +Generated Location: (1863:67,0 [268] ) | Image item1 = new Image() { id = 1, url="https://example.com"}; static Tag tag1 = new Tag() { description = "A description."}; @@ -40,16 +40,16 @@ Generated Location: (1855:67,0 [268] ) Source Location: (28:1,15 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |Item1| -Generated Location: (3090:93,0 [5] ) +Generated Location: (3098:93,0 [5] ) |Item1| Source Location: (41:1,28 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |Items2| -Generated Location: (3361:102,0 [6] ) +Generated Location: (3369:102,0 [6] ) |Items2| Source Location: (55:1,42 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |Item3| -Generated Location: (3633:111,0 [5] ) +Generated Location: (3641:111,0 [5] ) |Item3| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.codegen.cs index 42b383d35f9..09aafaa9cf7 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.codegen.cs @@ -11,9 +11,9 @@ namespace Test #line (1,2)-(1,40) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.mappings.txt index 18ca190ec37..f8ab69def5e 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/TestComponent.mappings.txt @@ -5,38 +5,38 @@ Generated Location: (320:11,0 [38] ) Source Location: (52:1,11 [5] x:\dir\subdir\Test\TestComponent.cshtml) |TItem| -Generated Location: (556:20,0 [5] ) +Generated Location: (564:20,0 [5] ) |TItem| Source Location: (82:5,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(Items1)| -Generated Location: (1115:36,0 [20] ) +Generated Location: (1123:36,0 [20] ) |ChildContent(Items1)| Source Location: (111:7,1 [33] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item in Items2) { | -Generated Location: (1323:45,0 [33] ) +Generated Location: (1331:45,0 [33] ) |foreach (var item in Items2) { | Source Location: (152:9,8 [18] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item)| -Generated Location: (1573:56,0 [18] ) +Generated Location: (1581:56,0 [18] ) |ChildContent(item)| Source Location: (176:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (1780:65,0 [3] ) +Generated Location: (1788:65,0 [3] ) |} | Source Location: (185:12,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(Items3())| -Generated Location: (2000:75,0 [22] ) +Generated Location: (2008:75,0 [22] ) |ChildContent(Items3())| Source Location: (222:14,7 [248] x:\dir\subdir\Test\TestComponent.cshtml) @@ -46,7 +46,7 @@ Source Location: (222:14,7 [248] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public Func Items3 { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } | -Generated Location: (2260:86,0 [248] ) +Generated Location: (2268:86,0 [248] ) | [Parameter] public TItem[] Items1 { get; set; } [Parameter] public List Items2 { get; set; } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs index 7aff1e759b3..eebc79571e3 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\UseTestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class UseTestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt index ca1a4303660..f787b3dbe8b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt @@ -5,22 +5,22 @@ Generated Location: (375:12,0 [10] ) Source Location: (35:1,22 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |items1| -Generated Location: (964:28,0 [6] ) +Generated Location: (972:28,0 [6] ) |items1| Source Location: (49:1,36 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |items2| -Generated Location: (1126:36,0 [6] ) +Generated Location: (1134:36,0 [6] ) |items2| Source Location: (63:1,50 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |items3| -Generated Location: (1288:44,0 [6] ) +Generated Location: (1296:44,0 [6] ) |items3| Source Location: (80:2,8 [22] x:\dir\subdir\Test\UseTestComponent.cshtml) |context[0].description| -Generated Location: (1571:54,0 [22] ) +Generated Location: (1579:54,0 [22] ) |context[0].description| Source Location: (135:5,7 [208] x:\dir\subdir\Test\UseTestComponent.cshtml) @@ -30,7 +30,7 @@ Source Location: (135:5,7 [208] x:\dir\subdir\Test\UseTestComponent.cshtml) List items2 = new List() { new [] { tag } }; Tag[] items3() => new [] { tag }; | -Generated Location: (1873:67,0 [208] ) +Generated Location: (1881:67,0 [208] ) | static Tag tag = new Tag() { description = "A description."}; Tag[] items1 = new [] { tag }; @@ -40,16 +40,16 @@ Generated Location: (1873:67,0 [208] ) Source Location: (28:1,15 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |Items1| -Generated Location: (2890:90,0 [6] ) +Generated Location: (2898:90,0 [6] ) |Items1| Source Location: (42:1,29 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |Items2| -Generated Location: (3145:99,0 [6] ) +Generated Location: (3153:99,0 [6] ) |Items2| Source Location: (56:1,43 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |Items3| -Generated Location: (3400:108,0 [6] ) +Generated Location: (3408:108,0 [6] ) |Items3| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.codegen.cs index 0917e78a100..51367c9782c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.codegen.cs @@ -11,9 +11,9 @@ namespace Test #line (1,2)-(1,40) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.mappings.txt index 4378eb79b55..05e4bb12fc4 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/TestComponent.mappings.txt @@ -5,37 +5,37 @@ Generated Location: (320:11,0 [38] ) Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem1| -Generated Location: (556:20,0 [6] ) +Generated Location: (564:20,0 [6] ) |TItem1| Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem2| -Generated Location: (703:28,0 [6] ) +Generated Location: (711:28,0 [6] ) |TItem2| Source Location: (102:6,4 [19] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(Item1)| -Generated Location: (1263:44,0 [19] ) +Generated Location: (1271:44,0 [19] ) |ChildContent(Item1)| Source Location: (130:8,1 [33] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item in Items2) { | -Generated Location: (1470:53,0 [33] ) +Generated Location: (1478:53,0 [33] ) |foreach (var item in Items2) { | Source Location: (171:10,8 [18] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item)| -Generated Location: (1720:64,0 [18] ) +Generated Location: (1728:64,0 [18] ) |ChildContent(item)| Source Location: (195:11,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (1927:73,0 [3] ) +Generated Location: (1935:73,0 [3] ) |} | @@ -45,7 +45,7 @@ Source Location: (207:13,7 [215] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public List<(TItem1, TItem2)> Items2 { get; set; } [Parameter] public RenderFragment<(TItem1, TItem2)> ChildContent { get; set; } | -Generated Location: (2113:83,0 [215] ) +Generated Location: (2121:83,0 [215] ) | [Parameter] public (TItem1, TItem2) Item1 { get; set; } [Parameter] public List<(TItem1, TItem2)> Items2 { get; set; } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs index 8ab4de41f40..5c81fb762b3 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\UseTestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class UseTestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt index 95ce432b66e..5db2ee94b25 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt @@ -5,17 +5,17 @@ Generated Location: (375:12,0 [10] ) Source Location: (34:1,21 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |item1| -Generated Location: (964:28,0 [5] ) +Generated Location: (972:28,0 [5] ) |item1| Source Location: (47:1,34 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |items2| -Generated Location: (1125:36,0 [6] ) +Generated Location: (1133:36,0 [6] ) |items2| Source Location: (64:2,8 [7] x:\dir\subdir\Test\UseTestComponent.cshtml) |context| -Generated Location: (1408:46,0 [7] ) +Generated Location: (1416:46,0 [7] ) |context| Source Location: (104:5,7 [176] x:\dir\subdir\Test\UseTestComponent.cshtml) @@ -24,7 +24,7 @@ Source Location: (104:5,7 [176] x:\dir\subdir\Test\UseTestComponent.cshtml) static (string, int) item2 = ("Another string", 42); List<(string, int)> items2 = new List<(string, int)>() { item2 }; | -Generated Location: (1695:59,0 [176] ) +Generated Location: (1703:59,0 [176] ) | (string, int) item1 = ("A string", 42); static (string, int) item2 = ("Another string", 42); @@ -33,11 +33,11 @@ Generated Location: (1695:59,0 [176] ) Source Location: (28:1,15 [5] x:\dir\subdir\Test\UseTestComponent.cshtml) |Item1| -Generated Location: (2685:81,0 [5] ) +Generated Location: (2693:81,0 [5] ) |Item1| Source Location: (40:1,27 [6] x:\dir\subdir\Test\UseTestComponent.cshtml) |Items2| -Generated Location: (2948:90,0 [6] ) +Generated Location: (2956:90,0 [6] ) |Items2| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs index dbbb6b02917..7505faa3a8a 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml" using N -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt index 7d75119464f..186f301dc3b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt @@ -5,22 +5,22 @@ Generated Location: (371:12,0 [7] ) Source Location: (21:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TParam| -Generated Location: (583:22,0 [6] ) +Generated Location: (591:22,0 [6] ) |TParam| Source Location: (239:11,27 [1] x:\dir\subdir\Test\TestComponent.cshtml) |1| -Generated Location: (1098:36,0 [1] ) +Generated Location: (1106:36,0 [1] ) |1| Source Location: (269:13,9 [20] x:\dir\subdir\Test\TestComponent.cshtml) |context.I1.MyClassId| -Generated Location: (1327:45,0 [20] ) +Generated Location: (1335:45,0 [20] ) |context.I1.MyClassId| Source Location: (293:13,33 [21] x:\dir\subdir\Test\TestComponent.cshtml) |context.I2.MyStructId| -Generated Location: (1596:55,0 [21] ) +Generated Location: (1604:55,0 [21] ) |context.I2.MyStructId| Source Location: (38:3,7 [169] x:\dir\subdir\Test\TestComponent.cshtml) @@ -31,7 +31,7 @@ Source Location: (38:3,7 [169] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public RenderFragment<(MyClass I1, MyStruct I2, TParam P)> Template { get; set; } | -Generated Location: (1850:67,0 [169] ) +Generated Location: (1858:67,0 [169] ) | [Parameter] public TParam InferParam { get; set; } @@ -42,6 +42,6 @@ Generated Location: (1850:67,0 [169] ) Source Location: (227:11,15 [10] x:\dir\subdir\Test\TestComponent.cshtml) |InferParam| -Generated Location: (2756:91,0 [10] ) +Generated Location: (2764:91,0 [10] ) |InferParam| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs index f1016f2628b..e65ecc4c981 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs @@ -11,9 +11,9 @@ namespace Test #line (1,2)-(1,40) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt index b9cf85912b5..a616d33f8ec 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt @@ -5,32 +5,32 @@ Generated Location: (320:11,0 [38] ) Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem1| -Generated Location: (556:20,0 [6] ) +Generated Location: (564:20,0 [6] ) |TItem1| Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem2| -Generated Location: (703:28,0 [6] ) +Generated Location: (711:28,0 [6] ) |TItem2| Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item2 in Items2) { | -Generated Location: (1173:42,0 [34] ) +Generated Location: (1181:42,0 [34] ) |foreach (var item2 in Items2) { | Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item2)| -Generated Location: (1422:53,0 [19] ) +Generated Location: (1430:53,0 [19] ) |ChildContent(item2)| Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (1687:63,0 [3] ) +Generated Location: (1695:63,0 [3] ) |} | @@ -40,7 +40,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public List Items2 { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } | -Generated Location: (1873:73,0 [185] ) +Generated Location: (1881:73,0 [185] ) | [Parameter] public TItem1 Item1 { get; set; } [Parameter] public List Items2 { get; set; } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.codegen.cs index f1016f2628b..e65ecc4c981 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.codegen.cs @@ -11,9 +11,9 @@ namespace Test #line (1,2)-(1,40) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.mappings.txt index bc2e4cd8c73..4646aed2ddb 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters_WithSemicolon/TestComponent.mappings.txt @@ -5,32 +5,32 @@ Generated Location: (320:11,0 [38] ) Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem1| -Generated Location: (556:20,0 [6] ) +Generated Location: (564:20,0 [6] ) |TItem1| Source Location: (72:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem2| -Generated Location: (703:28,0 [6] ) +Generated Location: (711:28,0 [6] ) |TItem2| Source Location: (100:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item2 in Items2) { | -Generated Location: (1173:42,0 [34] ) +Generated Location: (1181:42,0 [34] ) |foreach (var item2 in Items2) { | Source Location: (148:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item2)| -Generated Location: (1422:53,0 [19] ) +Generated Location: (1430:53,0 [19] ) |ChildContent(item2)| Source Location: (180:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (1687:63,0 [3] ) +Generated Location: (1695:63,0 [3] ) |} | @@ -40,7 +40,7 @@ Source Location: (190:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public List Items2 { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } | -Generated Location: (1873:73,0 [185] ) +Generated Location: (1881:73,0 [185] ) | [Parameter] public TItem1 Item1 { get; set; } [Parameter] public List Items2 { get; set; } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs index 1a6c58fca7d..c73fd9449ad 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs @@ -18,10 +18,10 @@ namespace Test #line (2,2)-(2,19) "x:\dir\subdir\Test\TestComponent.cshtml" using Foo = Test3 -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs index 6958ea6d1c5..70360436cf5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs @@ -25,10 +25,10 @@ namespace #line (2,2)-(2,25) "x:\dir\subdir\Test\_Imports.razor" using System.Reflection -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs index 07756e9e18b..3ffe0b55b9b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs @@ -25,10 +25,10 @@ namespace #line (2,2)-(2,25) "x:\dir\subdir\Test\_Imports.razor" using System.Reflection -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class Counter : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs index b462455fe70..ba116f3ae3c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs @@ -18,10 +18,10 @@ namespace Test #line (2,2)-(2,49) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Rendering -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt index b418307aa0f..6cafa2ee7ba 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt @@ -10,37 +10,37 @@ Generated Location: (524:18,0 [47] ) Source Location: (192:3,61 [3] x:\dir\subdir\Test\TestComponent.cshtml) |123| -Generated Location: (1324:37,0 [3] ) +Generated Location: (1332:37,0 [3] ) |123| Source Location: (318:6,30 [20] x:\dir\subdir\Test\TestComponent.cshtml) |myComponentReference| -Generated Location: (2178:54,0 [20] ) +Generated Location: (2186:54,0 [20] ) |myComponentReference| Source Location: (439:10,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) |if (DateTime.Now.Year > 1950) { | -Generated Location: (2497:66,0 [34] ) +Generated Location: (2505:66,0 [34] ) |if (DateTime.Now.Year > 1950) { | Source Location: (511:12,38 [18] x:\dir\subdir\Test\TestComponent.cshtml) |myElementReference| -Generated Location: (2907:79,0 [18] ) +Generated Location: (2915:79,0 [18] ) |myElementReference| Source Location: (589:13,30 [10] x:\dir\subdir\Test\TestComponent.cshtml) |myVariable| -Generated Location: (3568:96,0 [10] ) +Generated Location: (3576:96,0 [10] ) |myVariable| Source Location: (639:14,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (4062:108,0 [3] ) +Generated Location: (4070:108,0 [3] ) |} | @@ -55,7 +55,7 @@ Source Location: (651:16,7 [233] x:\dir\subdir\Test\TestComponent.cshtml) for (var i = 0; i < 10; i++) { | -Generated Location: (4248:118,0 [233] ) +Generated Location: (4256:118,0 [233] ) | ElementReference myElementReference; TemplatedComponent myComponentReference; @@ -69,12 +69,12 @@ Generated Location: (4248:118,0 [233] ) Source Location: (912:25,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) |i| -Generated Location: (4710:136,0 [1] ) +Generated Location: (4718:136,0 [1] ) |i| Source Location: (925:25,41 [1] x:\dir\subdir\Test\TestComponent.cshtml) |i| -Generated Location: (4996:147,0 [1] ) +Generated Location: (5004:147,0 [1] ) |i| Source Location: (933:26,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) @@ -85,7 +85,7 @@ Source Location: (933:26,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) System.GC.KeepAlive(myVariable); } | -Generated Location: (5178:156,0 [164] ) +Generated Location: (5186:156,0 [164] ) | } System.GC.KeepAlive(myElementReference); diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs index 0827f16f76c..159db3439c5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs @@ -18,10 +18,10 @@ namespace Test #line (2,2)-(2,25) "x:\dir\subdir\Test\_Imports.razor" using System.Reflection -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore #line (3,12)-(3,26) "x:\dir\subdir\Test\_Imports.razor" [Serializable] diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithMultipleUsingDirectives/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithMultipleUsingDirectives/TestComponent.codegen.cs index fcde6b49d7b..b3acb676300 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithMultipleUsingDirectives/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithMultipleUsingDirectives/TestComponent.codegen.cs @@ -23,9 +23,9 @@ namespace Test #line (2,4)-(2,28) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Reflection; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs index 68a7e858937..e982a1e72b7 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs @@ -19,10 +19,10 @@ namespace #line (1,2)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt index b0f4f1ae836..cb4951e79a2 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt @@ -10,11 +10,11 @@ Generated Location: (513:19,0 [10] ) Source Location: (56:3,17 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Header| -Generated Location: (1146:36,0 [6] ) +Generated Location: (1154:36,0 [6] ) |Header| Source Location: (109:5,17 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Footer| -Generated Location: (1574:48,0 [6] ) +Generated Location: (1582:48,0 [6] ) |Footer| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs index f413a2dccaa..e745d727f2c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml" using Test2 -#line default -#line hidden #nullable disable ; + #line default + #line hidden [global::Microsoft.AspNetCore.Components.RouteAttribute( // language=Route,Component #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt index 5aa1d95f890..41b92897113 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [11] ) Source Location: (6:0,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) |"/MyPage"| -Generated Location: (618:22,0 [9] ) +Generated Location: (626:22,0 [9] ) |"/MyPage"| Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"/AnotherRoute/{id}"| -Generated Location: (863:32,0 [20] ) +Generated Location: (871:32,0 [20] ) |"/AnotherRoute/{id}"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs index ff98e010122..d3fd37f56d9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs @@ -18,10 +18,10 @@ namespace Test #line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml" using Test3 -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs index a8b1a964ae9..4b73e49c38a 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt index fb6b7b83ae8..1768ec598d6 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt @@ -5,14 +5,14 @@ Generated Location: (372:12,0 [41] ) Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) |text| -Generated Location: (1200:32,0 [4] ) +Generated Location: (1208:32,0 [4] ) |text| Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) | private string text = "hi"; | -Generated Location: (1705:46,0 [35] ) +Generated Location: (1713:46,0 [35] ) | private string text = "hi"; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs index 44599c30b5f..e62cafd2de1 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt index e601e9b778d..f70f3852287 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt @@ -5,19 +5,19 @@ Generated Location: (372:12,0 [41] ) Source Location: (130:2,79 [8] x:\dir\subdir\Test\TestComponent.cshtml) |() => {}| -Generated Location: (1213:31,0 [8] ) +Generated Location: (1221:31,0 [8] ) |() => {}| Source Location: (86:2,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) |text| -Generated Location: (1487:40,0 [4] ) +Generated Location: (1495:40,0 [4] ) |text| Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) | private string text = "hi"; | -Generated Location: (1991:54,0 [35] ) +Generated Location: (1999:54,0 [35] ) | private string text = "hi"; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs index d678a022927..8c0982d4668 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt index fb6b7b83ae8..1768ec598d6 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt @@ -5,14 +5,14 @@ Generated Location: (372:12,0 [41] ) Source Location: (91:2,40 [4] x:\dir\subdir\Test\TestComponent.cshtml) |text| -Generated Location: (1200:32,0 [4] ) +Generated Location: (1208:32,0 [4] ) |text| Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) | private string text = "hi"; | -Generated Location: (1705:46,0 [35] ) +Generated Location: (1713:46,0 [35] ) | private string text = "hi"; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs index c3022adb3cb..4d4900e8816 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt index 7bd2917e27f..dc57fc926de 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) |() => {}| -Generated Location: (1217:31,0 [8] ) +Generated Location: (1225:31,0 [8] ) |() => {}| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs index 289a09d4560..8c3797450c4 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt index 7d1910dbaa4..2be87acfaf0 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt @@ -5,12 +5,12 @@ Generated Location: (372:12,0 [41] ) Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1028:29,0 [7] ) +Generated Location: (1036:29,0 [7] ) |OnClick| Source Location: (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml) |EventCallback.Factory.Create(this, Increment)| -Generated Location: (1518:37,0 [61] ) +Generated Location: (1526:37,0 [61] ) |EventCallback.Factory.Create(this, Increment)| Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) @@ -20,7 +20,7 @@ Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (1819:48,0 [87] ) +Generated Location: (1827:48,0 [87] ) | private int counter; private void Increment() { diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs index 575ab3254eb..5bb28083dbf 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt index 19271ac76a5..c9eec819a28 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt @@ -5,12 +5,12 @@ Generated Location: (372:12,0 [41] ) Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1028:29,0 [7] ) +Generated Location: (1036:29,0 [7] ) |OnClick| Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Increment| -Generated Location: (1518:37,0 [9] ) +Generated Location: (1526:37,0 [9] ) |Increment| Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml) @@ -20,7 +20,7 @@ Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (1767:48,0 [103] ) +Generated Location: (1775:48,0 [103] ) | private int counter; private void Increment(MouseEventArgs e) { diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs index dc8ff6d28fa..3a458c13975 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt index 72e4396017a..8d6ae294b6b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt @@ -5,12 +5,12 @@ Generated Location: (372:12,0 [41] ) Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1028:29,0 [7] ) +Generated Location: (1036:29,0 [7] ) |OnClick| Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Increment| -Generated Location: (1518:37,0 [9] ) +Generated Location: (1526:37,0 [9] ) |Increment| Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml) @@ -21,7 +21,7 @@ Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (1768:48,0 [139] ) +Generated Location: (1776:48,0 [139] ) | private int counter; private Task Increment(MouseEventArgs e) { diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs index 098f4fb2fa4..08d787ac69d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt index 6df01aa2d11..21307e42d2b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt @@ -5,12 +5,12 @@ Generated Location: (372:12,0 [41] ) Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1028:29,0 [7] ) +Generated Location: (1036:29,0 [7] ) |OnClick| Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Increment| -Generated Location: (1518:37,0 [9] ) +Generated Location: (1526:37,0 [9] ) |Increment| Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) @@ -20,7 +20,7 @@ Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (1767:48,0 [104] ) +Generated Location: (1775:48,0 [104] ) | private int counter; private void Increment(ChangeEventArgs e) { diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs index 9374aa88682..7417425b9b9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt index 4cdc3ac6461..9cdbc162aa2 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_AttributeNameIsCaseSensitive/TestComponent.mappings.txt @@ -8,7 +8,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(MouseEventArgs e) { } | -Generated Location: (1003:30,0 [47] ) +Generated Location: (1011:30,0 [47] ) | void OnClick(MouseEventArgs e) { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs index 60a4e1a6951..bab15eb872a 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt index f6d55d19f72..85b3515dfa5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1114:29,0 [7] ) +Generated Location: (1122:29,0 [7] ) |OnClick| Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (81:2,7 [42] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(EventArgs e) { } | -Generated Location: (1358:40,0 [42] ) +Generated Location: (1366:40,0 [42] ) | void OnClick(EventArgs e) { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs index 63d64f1a660..8b0f4265302 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt index f5e35456294..ba220232b3b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1114:29,0 [7] ) +Generated Location: (1122:29,0 [7] ) |OnClick| Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(MouseEventArgs e) { } | -Generated Location: (1358:40,0 [47] ) +Generated Location: (1366:40,0 [47] ) | void OnClick(MouseEventArgs e) { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs index ca5bf2b9ad8..ecc02226386 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt index 8e4ca066ad9..00f99e57412 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) |x => { }| -Generated Location: (1114:29,0 [8] ) +Generated Location: (1122:29,0 [8] ) |x => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs index 63d64f1a660..8b0f4265302 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt index f5e35456294..ba220232b3b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1114:29,0 [7] ) +Generated Location: (1122:29,0 [7] ) |OnClick| Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (81:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(MouseEventArgs e) { } | -Generated Location: (1358:40,0 [47] ) +Generated Location: (1366:40,0 [47] ) | void OnClick(MouseEventArgs e) { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs index ca5bf2b9ad8..ecc02226386 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt index 8e4ca066ad9..00f99e57412 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [8] x:\dir\subdir\Test\TestComponent.cshtml) |x => { }| -Generated Location: (1114:29,0 [8] ) +Generated Location: (1122:29,0 [8] ) |x => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs index 805e7c6aa2c..7e7f2b923a1 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt index 70ad8ba0712..6e3e731269d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1114:29,0 [7] ) +Generated Location: (1122:29,0 [7] ) |OnClick| Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (81:2,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick() { } | -Generated Location: (1358:40,0 [31] ) +Generated Location: (1366:40,0 [31] ) | void OnClick() { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs index 2654c0b9754..eae6aa2ccf5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt index 1e21b2fef9b..c81c5918652 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1114:29,0 [9] ) +Generated Location: (1122:29,0 [9] ) |() => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs index 17e15904060..104f66497e4 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs index 03e681bf49d..fce0866b551 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt index bd073b02141..641564c3a00 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (372:12,0 [41] ) Source Location: (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1160:30,0 [7] ) +Generated Location: (1168:30,0 [7] ) |OnClick| Source Location: (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick() { } | -Generated Location: (1443:42,0 [31] ) +Generated Location: (1451:42,0 [31] ) | void OnClick() { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs index e460bfe1fbf..3557c2ad8d0 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt index 7818d058575..7137c27a6a7 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_Duplicates/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (76:1,32 [4] x:\dir\subdir\Test\TestComponent.cshtml) |true| -Generated Location: (998:29,0 [4] ) +Generated Location: (1006:29,0 [4] ) |true| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs index 31a8444a77b..8424896afae 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt index 4442bbd5751..86b9907016d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation/TestComponent.mappings.txt @@ -5,29 +5,29 @@ Generated Location: (372:12,0 [41] ) Source Location: (62:1,18 [17] x:\dir\subdir\Test\TestComponent.cshtml) |() => Foo = false| -Generated Location: (1115:29,0 [17] ) +Generated Location: (1123:29,0 [17] ) |() => Foo = false| Source Location: (106:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml) |true| -Generated Location: (1353:38,0 [4] ) +Generated Location: (1361:38,0 [4] ) |true| Source Location: (138:1,94 [3] x:\dir\subdir\Test\TestComponent.cshtml) |Foo| -Generated Location: (1578:47,0 [3] ) +Generated Location: (1586:47,0 [3] ) |Foo| Source Location: (169:1,125 [5] x:\dir\subdir\Test\TestComponent.cshtml) |false| -Generated Location: (1804:56,0 [5] ) +Generated Location: (1812:56,0 [5] ) |false| Source Location: (202:2,7 [30] x:\dir\subdir\Test\TestComponent.cshtml) | bool Foo { get; set; } | -Generated Location: (2095:68,0 [30] ) +Generated Location: (2103:68,0 [30] ) | bool Foo { get; set; } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs index eab0bba670b..862511080f1 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_PreventDefault_StopPropagation_Minimized/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs index 8f2d01154e4..a952ea458f5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt index 8e7f0449798..a675f5039f9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_WithDelegate_PreventDefault/TestComponent.mappings.txt @@ -5,12 +5,12 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnFocus| -Generated Location: (1114:29,0 [7] ) +Generated Location: (1122:29,0 [7] ) |OnFocus| Source Location: (95:1,51 [22] x:\dir\subdir\Test\TestComponent.cshtml) |ShouldPreventDefault()| -Generated Location: (1342:38,0 [22] ) +Generated Location: (1350:38,0 [22] ) |ShouldPreventDefault()| Source Location: (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml) @@ -19,7 +19,7 @@ Source Location: (130:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml) bool ShouldPreventDefault() { return false; } | -Generated Location: (1600:49,0 [95] ) +Generated Location: (1608:49,0 [95] ) | void OnFocus(FocusEventArgs e) { } diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.codegen.cs index 9b8aab360a7..a9ac95a2075 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.mappings.txt index 46356451c32..9d86410cfa9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpError/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (98:1,54 [1] x:\dir\subdir\Test\TestComponent.cshtml) |x| -Generated Location: (1422:39,0 [1] ) +Generated Location: (1430:39,0 [1] ) |x| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.codegen.cs index 15387a0fe31..7ef7efb0111 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.mappings.txt index 113aeb5f93d..0baea5c51c1 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (99:1,55 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (1422:39,0 [20] ) +Generated Location: (1430:39,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.codegen.cs index 54e590f0c49..b6a83aa1ae6 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.mappings.txt index f924c4dd928..49486aeda42 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_CSharpValue_Integer/TestComponent.mappings.txt @@ -5,19 +5,19 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (98:1,54 [1] x:\dir\subdir\Test\TestComponent.cshtml) |x| -Generated Location: (1422:39,0 [1] ) +Generated Location: (1430:39,0 [1] ) |x| Source Location: (117:2,7 [18] x:\dir\subdir\Test\TestComponent.cshtml) | int x = 1; | -Generated Location: (1721:51,0 [18] ) +Generated Location: (1729:51,0 [18] ) | int x = 1; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.codegen.cs index 350bdebc173..941b8a9911f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.mappings.txt index 73e24e43601..b2ddce76e92 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_ChildContent/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (92:2,8 [12] x:\dir\subdir\Test\TestComponent.cshtml) |DateTime.Now| -Generated Location: (1261:33,0 [12] ) +Generated Location: (1269:33,0 [12] ) |DateTime.Now| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs index bfe244cc8e1..f3fd8bdd481 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt index 3c790d8a06b..83be993fd5e 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt @@ -5,16 +5,16 @@ Generated Location: (372:12,0 [41] ) Source Location: (84:1,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1178:30,0 [9] ) +Generated Location: (1186:30,0 [9] ) |() => { }| Source Location: (170:2,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1813:44,0 [9] ) +Generated Location: (1821:44,0 [9] ) |() => { }| Source Location: (194:2,64 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (2035:53,0 [20] ) +Generated Location: (2043:53,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs index a9436c2a2f2..bdaec4406f0 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt index 6d5586c9148..da9f4220c29 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt @@ -5,50 +5,50 @@ Generated Location: (372:12,0 [41] ) Source Location: (55:1,11 [1] x:\dir\subdir\Test\TestComponent.cshtml) |T| -Generated Location: (618:22,0 [1] ) +Generated Location: (626:22,0 [1] ) |T| Source Location: (98:2,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1238:36,0 [9] ) +Generated Location: (1246:36,0 [9] ) |() => { }| Source Location: (151:2,93 [1] x:\dir\subdir\Test\TestComponent.cshtml) |1| -Generated Location: (1426:44,0 [1] ) +Generated Location: (1434:44,0 [1] ) |1| Source Location: (198:3,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1844:54,0 [9] ) +Generated Location: (1852:54,0 [9] ) |() => { }| Source Location: (222:3,64 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (2007:62,0 [20] ) +Generated Location: (2015:62,0 [20] ) |"named-form-handler"| Source Location: (256:3,98 [1] x:\dir\subdir\Test\TestComponent.cshtml) |2| -Generated Location: (2182:70,0 [1] ) +Generated Location: (2190:70,0 [1] ) |2| Source Location: (270:4,7 [52] x:\dir\subdir\Test\TestComponent.cshtml) | [Parameter] public T Parameter { get; set; } | -Generated Location: (2380:80,0 [52] ) +Generated Location: (2388:80,0 [52] ) | [Parameter] public T Parameter { get; set; } | Source Location: (140:2,82 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Parameter| -Generated Location: (3350:103,0 [9] ) +Generated Location: (3358:103,0 [9] ) |Parameter| Source Location: (245:3,87 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Parameter| -Generated Location: (4228:120,0 [9] ) +Generated Location: (4236:120,0 [9] ) |Parameter| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs index 7942b809db4..7227a02ca88 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt index a38f5e10744..10733e3ec4b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt @@ -5,50 +5,50 @@ Generated Location: (372:12,0 [41] ) Source Location: (55:1,11 [1] x:\dir\subdir\Test\TestComponent.cshtml) |T| -Generated Location: (618:22,0 [1] ) +Generated Location: (626:22,0 [1] ) |T| Source Location: (98:2,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1238:36,0 [9] ) +Generated Location: (1246:36,0 [9] ) |() => { }| Source Location: (151:2,93 [1] x:\dir\subdir\Test\TestComponent.cshtml) |1| -Generated Location: (1426:44,0 [1] ) +Generated Location: (1434:44,0 [1] ) |1| Source Location: (198:3,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1844:54,0 [9] ) +Generated Location: (1852:54,0 [9] ) |() => { }| Source Location: (222:3,64 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (2007:62,0 [20] ) +Generated Location: (2015:62,0 [20] ) |"named-form-handler"| Source Location: (256:3,98 [1] x:\dir\subdir\Test\TestComponent.cshtml) |2| -Generated Location: (2182:70,0 [1] ) +Generated Location: (2190:70,0 [1] ) |2| Source Location: (270:4,7 [52] x:\dir\subdir\Test\TestComponent.cshtml) | [Parameter] public T Parameter { get; set; } | -Generated Location: (2380:80,0 [52] ) +Generated Location: (2388:80,0 [52] ) | [Parameter] public T Parameter { get; set; } | Source Location: (140:2,82 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Parameter| -Generated Location: (3338:103,0 [9] ) +Generated Location: (3346:103,0 [9] ) |Parameter| Source Location: (245:3,87 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Parameter| -Generated Location: (4212:120,0 [9] ) +Generated Location: (4220:120,0 [9] ) |Parameter| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs index 6ef3965ff99..387d384955d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt index d2c7d6ed4ff..665e504a344 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt @@ -5,16 +5,16 @@ Generated Location: (372:12,0 [41] ) Source Location: (84:1,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1179:30,0 [9] ) +Generated Location: (1187:30,0 [9] ) |() => { }| Source Location: (170:2,40 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1817:44,0 [9] ) +Generated Location: (1825:44,0 [9] ) |() => { }| Source Location: (194:2,64 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (2040:53,0 [20] ) +Generated Location: (2048:53,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.codegen.cs index 21cbbbb3b74..d4a968037de 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.mappings.txt index 18801c26d93..cd79f4bbac1 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_CSharpValue/TestComponent.mappings.txt @@ -5,17 +5,17 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (98:1,54 [1] x:\dir\subdir\Test\TestComponent.cshtml) |x| -Generated Location: (1422:39,0 [1] ) +Generated Location: (1430:39,0 [1] ) |x| Source Location: (113:1,69 [1] x:\dir\subdir\Test\TestComponent.cshtml) |y| -Generated Location: (1611:48,0 [1] ) +Generated Location: (1619:48,0 [1] ) |y| Source Location: (132:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) @@ -23,7 +23,7 @@ Source Location: (132:2,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) string x = "a"; string y = "b"; | -Generated Location: (1963:61,0 [44] ) +Generated Location: (1971:61,0 [44] ) | string x = "a"; string y = "b"; diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.codegen.cs index a6d12d5e6c2..aa2ba0c9792 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.mappings.txt index c1444e4040c..992938d921f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Duplicate_HtmlValue/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.codegen.cs index 30586d03849..dd5e1d89c0d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.mappings.txt index 22f94a2c94d..059ac85be0f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_FakeSubmit/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (161:2,45 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (1628:38,0 [20] ) +Generated Location: (1636:38,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.codegen.cs index 9cace2b985d..549f64b217c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.mappings.txt index c1444e4040c..992938d921f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_HtmlValue/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.codegen.cs index dd358638148..803bdcbd8c7 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.mappings.txt index 0e4637829b0..463ec402a9f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MissingSubmit/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (137:2,33 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (1516:36,0 [20] ) +Generated Location: (1524:36,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.codegen.cs index 50ead83a682..a01719bae30 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.mappings.txt index 926948493eb..583a8741248 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MixedValue/TestComponent.mappings.txt @@ -5,24 +5,24 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (105:1,61 [9] x:\dir\subdir\Test\TestComponent.cshtml) |"literal"| -Generated Location: (1439:39,0 [9] ) +Generated Location: (1447:39,0 [9] ) |"literal"| Source Location: (117:1,73 [1] x:\dir\subdir\Test\TestComponent.cshtml) |x| -Generated Location: (1607:47,0 [1] ) +Generated Location: (1615:47,0 [1] ) |x| Source Location: (140:2,7 [18] x:\dir\subdir\Test\TestComponent.cshtml) | int x = 1; | -Generated Location: (1916:59,0 [18] ) +Generated Location: (1924:59,0 [18] ) | int x = 1; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.codegen.cs index 4fa757d0ba4..a959d7cd85d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.mappings.txt index 9fbccb4b9eb..987dc2b4b11 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_CSharpValue/TestComponent.mappings.txt @@ -5,22 +5,22 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (98:1,54 [1] x:\dir\subdir\Test\TestComponent.cshtml) |x| -Generated Location: (1422:39,0 [1] ) +Generated Location: (1430:39,0 [1] ) |x| Source Location: (141:2,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1984:53,0 [9] ) +Generated Location: (1992:53,0 [9] ) |() => { }| Source Location: (164:2,54 [1] x:\dir\subdir\Test\TestComponent.cshtml) |y| -Generated Location: (2271:62,0 [1] ) +Generated Location: (2279:62,0 [1] ) |y| Source Location: (183:3,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) @@ -28,7 +28,7 @@ Source Location: (183:3,7 [44] x:\dir\subdir\Test\TestComponent.cshtml) string x = "a"; string y = "b"; | -Generated Location: (2573:74,0 [44] ) +Generated Location: (2581:74,0 [44] ) | string x = "a"; string y = "b"; diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.codegen.cs index e5a2f0966fe..915dd979ccd 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.mappings.txt index c57abf29d64..76e34d179f2 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_MoreElements_HtmlValue/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (140:2,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1838:45,0 [9] ) +Generated Location: (1846:45,0 [9] ) |() => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs index afc73dccaf5..9fe63d38274 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt index 5e60bf20018..25ed0987d2e 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt @@ -5,29 +5,29 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (161:3,35 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (2052:47,0 [9] ) +Generated Location: (2060:47,0 [9] ) |() => { }| Source Location: (255:5,39 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (3026:64,0 [9] ) +Generated Location: (3034:64,0 [9] ) |() => { }| Source Location: (346:7,35 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (3880:82,0 [9] ) +Generated Location: (3888:82,0 [9] ) |() => { }| Source Location: (405:9,7 [68] x:\dir\subdir\Test\TestComponent.cshtml) | [Parameter] public RenderFragment ChildContent { get; set; } | -Generated Location: (4416:98,0 [68] ) +Generated Location: (4424:98,0 [68] ) | [Parameter] public RenderFragment ChildContent { get; set; } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.codegen.cs index 5c63f518cd7..7d9cac38f0c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.mappings.txt index c1444e4040c..992938d921f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NoAddNamedEventMethod/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.codegen.cs index 0da70487c7d..415eb5e641b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.mappings.txt index 5aeae473958..6f3c31cb4d9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm/TestComponent.mappings.txt @@ -5,16 +5,16 @@ Generated Location: (372:12,0 [41] ) Source Location: (74:1,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1137:30,0 [9] ) +Generated Location: (1145:30,0 [9] ) |() => { }| Source Location: (154:2,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1720:44,0 [9] ) +Generated Location: (1728:44,0 [9] ) |() => { }| Source Location: (178:2,54 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (1933:53,0 [20] ) +Generated Location: (1941:53,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.codegen.cs index 0da70487c7d..415eb5e641b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.mappings.txt index 5aeae473958..6f3c31cb4d9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_NotAForm_RazorLangVersion7/TestComponent.mappings.txt @@ -5,16 +5,16 @@ Generated Location: (372:12,0 [41] ) Source Location: (74:1,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1137:30,0 [9] ) +Generated Location: (1145:30,0 [9] ) |() => { }| Source Location: (154:2,30 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1720:44,0 [9] ) +Generated Location: (1728:44,0 [9] ) |() => { }| Source Location: (178:2,54 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"named-form-handler"| -Generated Location: (1933:53,0 [20] ) +Generated Location: (1941:53,0 [20] ) |"named-form-handler"| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.codegen.cs index fb3bf0e9b7d..fb3b1a29022 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.mappings.txt index d803d5eda6a..7cad463062f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nullability/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (98:1,54 [4] x:\dir\subdir\Test\TestComponent.cshtml) |null| -Generated Location: (1422:39,0 [4] ) +Generated Location: (1430:39,0 [4] ) |null| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.codegen.cs index 27378ffd5ac..3856ccd7735 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.mappings.txt index f3c6605a12a..5b33b83eee0 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorError/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| Source Location: (99:1,55 [1] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (1422:39,0 [1] ) +Generated Location: (1430:39,0 [1] ) | | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.codegen.cs index 5c63f518cd7..7d9cac38f0c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.mappings.txt index c1444e4040c..992938d921f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_RazorLangVersion7/TestComponent.mappings.txt @@ -5,6 +5,6 @@ Generated Location: (372:12,0 [41] ) Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1138:30,0 [9] ) +Generated Location: (1146:30,0 [9] ) |() => { }| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs index 742b6921f7f..ccd8fe28007 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (2,2)-(2,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt index 79831b701e7..19b8d3d9de3 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt @@ -5,16 +5,16 @@ Generated Location: (372:12,0 [10] ) Source Location: (11:0,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TChild| -Generated Location: (587:22,0 [6] ) +Generated Location: (595:22,0 [6] ) |TChild| Source Location: (60:2,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (1161:37,0 [7] ) +Generated Location: (1169:37,0 [7] ) |MyEvent| Source Location: (69:2,37 [16] x:\dir\subdir\Test\TestComponent.cshtml) |(TChild x) => {}| -Generated Location: (1547:45,0 [16] ) +Generated Location: (1555:45,0 [16] ) |(TChild x) => {}| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs index 6e09653962b..64b7d67bf54 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (2,2)-(2,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent< #nullable restore diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt index ab3b9631767..cdca58b2a0b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt @@ -5,17 +5,17 @@ Generated Location: (372:12,0 [10] ) Source Location: (11:0,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TChild| -Generated Location: (587:22,0 [6] ) +Generated Location: (595:22,0 [6] ) |TChild| Source Location: (51:2,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) |ChildItem| -Generated Location: (1098:36,0 [9] ) +Generated Location: (1106:36,0 [9] ) |ChildItem| Source Location: (71:2,39 [12] x:\dir\subdir\Test\TestComponent.cshtml) |MyChildEvent| -Generated Location: (1335:44,0 [12] ) +Generated Location: (1343:44,0 [12] ) |MyChildEvent| Source Location: (97:4,1 [138] x:\dir\subdir\Test\TestComponent.cshtml) @@ -23,7 +23,7 @@ Source Location: (97:4,1 [138] x:\dir\subdir\Test\TestComponent.cshtml) [Parameter] public TChild ChildItem { get; set; } [Parameter] public EventCallback MyChildEvent { get; set; } | -Generated Location: (1545:54,0 [138] ) +Generated Location: (1553:54,0 [138] ) | [Parameter] public TChild ChildItem { get; set; } [Parameter] public EventCallback MyChildEvent { get; set; } @@ -31,11 +31,11 @@ Generated Location: (1545:54,0 [138] ) Source Location: (45:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (2357:75,0 [4] ) +Generated Location: (2365:75,0 [4] ) |Item| Source Location: (62:2,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (2605:84,0 [7] ) +Generated Location: (2613:84,0 [7] ) |MyEvent| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs index 0ab58f5a3ff..04e2157186d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt index 437f54bf89d..c486eb8f2c6 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt @@ -5,21 +5,21 @@ Generated Location: (372:12,0 [10] ) Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (950:28,0 [1] ) +Generated Location: (958:28,0 [1] ) |3| Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) |(int x) => {}| -Generated Location: (1179:36,0 [13] ) +Generated Location: (1187:36,0 [13] ) |(int x) => {}| Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (1932:57,0 [4] ) +Generated Location: (1940:57,0 [4] ) |Item| Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (2180:66,0 [7] ) +Generated Location: (2188:66,0 [7] ) |MyEvent| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs index dbba6acc103..f06ed0f2c3f 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs @@ -17,10 +17,10 @@ namespace Test #line (2,2)-(2,34) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Collections.Generic -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt index dfa77e68b18..479997d5071 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt @@ -10,21 +10,21 @@ Generated Location: (446:17,0 [32] ) Source Location: (67:2,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (1046:33,0 [1] ) +Generated Location: (1054:33,0 [1] ) |3| Source Location: (79:2,31 [26] x:\dir\subdir\Test\TestComponent.cshtml) |(IEnumerable x) => {}| -Generated Location: (1275:41,0 [26] ) +Generated Location: (1283:41,0 [26] ) |(IEnumerable x) => {}| Source Location: (61:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (2089:62,0 [4] ) +Generated Location: (2097:62,0 [4] ) |Item| Source Location: (70:2,22 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (2337:71,0 [7] ) +Generated Location: (2345:71,0 [7] ) |MyEvent| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs index 099ce735013..aeb12d5d069 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt index 8f0d1ccb635..d6a6111ba10 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt @@ -5,21 +5,21 @@ Generated Location: (372:12,0 [10] ) Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (950:28,0 [1] ) +Generated Location: (958:28,0 [1] ) |3| Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) |x => {}| -Generated Location: (1205:36,0 [7] ) +Generated Location: (1213:36,0 [7] ) |x => {}| Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (1971:57,0 [4] ) +Generated Location: (1979:57,0 [4] ) |Item| Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (2219:66,0 [7] ) +Generated Location: (2227:66,0 [7] ) |MyEvent| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs index b38150d1712..64b94ab0904 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt index 6ba6fde0b89..842cda3d95a 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt @@ -5,21 +5,21 @@ Generated Location: (372:12,0 [10] ) Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (950:28,0 [1] ) +Generated Location: (958:28,0 [1] ) |3| Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) |x => {}| -Generated Location: (1294:36,0 [7] ) +Generated Location: (1302:36,0 [7] ) |x => {}| Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (2173:57,0 [4] ) +Generated Location: (2181:57,0 [4] ) |Item| Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (2421:66,0 [7] ) +Generated Location: (2429:66,0 [7] ) |MyEvent| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs index a5f05ffdd7e..37d26e0ac1c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt index 8ad25ccaec9..c0aa1d96bcf 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt @@ -5,21 +5,21 @@ Generated Location: (372:12,0 [10] ) Source Location: (32:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (950:28,0 [1] ) +Generated Location: (958:28,0 [1] ) |3| Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml) |x => {}| -Generated Location: (1179:36,0 [7] ) +Generated Location: (1187:36,0 [7] ) |x => {}| Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (1919:57,0 [4] ) +Generated Location: (1927:57,0 [4] ) |Item| Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml) |MyEvent| -Generated Location: (2167:66,0 [7] ) +Generated Location: (2175:66,0 [7] ) |MyEvent| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs index 411dd9c6502..29701915f87 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml" using Test.Shared -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt index f7a4a7509e2..401c5557f8a 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt @@ -5,30 +5,30 @@ Generated Location: (372:12,0 [17] ) Source Location: (39:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (957:28,0 [1] ) +Generated Location: (965:28,0 [1] ) |3| Source Location: (48:1,28 [5] x:\dir\subdir\Test\TestComponent.cshtml) |Hello| -Generated Location: (1111:36,0 [5] ) +Generated Location: (1119:36,0 [5] ) |Hello| Source Location: (68:3,7 [38] x:\dir\subdir\Test\TestComponent.cshtml) | MyClass Hello = new MyClass(); | -Generated Location: (1313:46,0 [38] ) +Generated Location: (1321:46,0 [38] ) | MyClass Hello = new MyClass(); | Source Location: (33:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) |Item| -Generated Location: (1992:66,0 [4] ) +Generated Location: (2000:66,0 [4] ) |Item| Source Location: (42:1,22 [3] x:\dir\subdir\Test\TestComponent.cshtml) |Foo| -Generated Location: (2240:75,0 [3] ) +Generated Location: (2248:75,0 [3] ) |Foo| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs index cb397d7632e..e79d9aab3e6 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml" using Test -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt index 981419865f6..4884032ea02 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt @@ -5,11 +5,11 @@ Generated Location: (372:12,0 [10] ) Source Location: (37:1,24 [1] x:\dir\subdir\Test\TestComponent.cshtml) |1| -Generated Location: (950:28,0 [1] ) +Generated Location: (958:28,0 [1] ) |1| Source Location: (26:1,13 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Parameter| -Generated Location: (1626:50,0 [9] ) +Generated Location: (1634:50,0 [9] ) |Parameter| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.codegen.cs index aa9f1091e9f..8e493f86c2c 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Text -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.mappings.txt index 9527698326f..8d4e1922557 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InjectDirective/TestComponent.mappings.txt @@ -5,51 +5,51 @@ Generated Location: (372:12,0 [17] ) Source Location: (172:10,8 [5] x:\dir\subdir\Test\TestComponent.cshtml) |float| -Generated Location: (1060:31,0 [5] ) +Generated Location: (1068:31,0 [5] ) |float| Source Location: (178:10,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Value5| -Generated Location: (1212:39,0 [6] ) +Generated Location: (1220:39,0 [6] ) |Value5| Source Location: (117:4,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) |double| -Generated Location: (1473:49,0 [6] ) +Generated Location: (1481:49,0 [6] ) |double| Source Location: (124:4,15 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Value4| -Generated Location: (1624:57,0 [6] ) +Generated Location: (1632:57,0 [6] ) |Value4| Source Location: (96:3,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) |int| -Generated Location: (1885:67,0 [3] ) +Generated Location: (1893:67,0 [3] ) |int| Source Location: (100:3,12 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Value3| -Generated Location: (2033:75,0 [6] ) +Generated Location: (2041:75,0 [6] ) |Value3| Source Location: (57:2,14 [13] x:\dir\subdir\Test\TestComponent.cshtml) |StringBuilder| -Generated Location: (2295:85,0 [13] ) +Generated Location: (2303:85,0 [13] ) |StringBuilder| Source Location: (80:2,37 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Value2| -Generated Location: (2453:93,0 [6] ) +Generated Location: (2461:93,0 [6] ) |Value2| Source Location: (28:1,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (2714:103,0 [6] ) +Generated Location: (2722:103,0 [6] ) |string| Source Location: (35:1,15 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Value1| -Generated Location: (2865:111,0 [6] ) +Generated Location: (2873:111,0 [6] ) |Value1| diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs index 7647a547697..08c29ef847b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs @@ -11,10 +11,10 @@ namespace Test #line (1,2)-(1,14) "x:\dir\subdir\Test\TestComponent.cshtml" using System -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs index 7647a547697..08c29ef847b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs @@ -11,10 +11,10 @@ namespace Test #line (1,2)-(1,14) "x:\dir\subdir\Test\TestComponent.cshtml" using System -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs index 1e90e1248b5..7f78e313a3d 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Rendering -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt index 008f792204a..1df803f21da 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt @@ -8,7 +8,7 @@ Source Location: (57:1,7 [57] x:\dir\subdir\Test\TestComponent.cshtml) void MyMethod(RenderTreeBuilder __builder) { | -Generated Location: (933:29,0 [57] ) +Generated Location: (941:29,0 [57] ) | void MyMethod(RenderTreeBuilder __builder) { @@ -16,34 +16,34 @@ Generated Location: (933:29,0 [57] ) Source Location: (128:5,0 [12] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (1258:42,0 [12] ) +Generated Location: (1266:42,0 [12] ) | | Source Location: (141:5,13 [46] x:\dir\subdir\Test\TestComponent.cshtml) |for (var i = 0; i < 100; i++) { | -Generated Location: (1405:50,0 [46] ) +Generated Location: (1413:50,0 [46] ) |for (var i = 0; i < 100; i++) { | Source Location: (230:8,21 [1] x:\dir\subdir\Test\TestComponent.cshtml) |i| -Generated Location: (1782:63,0 [1] ) +Generated Location: (1790:63,0 [1] ) |i| Source Location: (256:10,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (2076:74,0 [15] ) +Generated Location: (2084:74,0 [15] ) | } | Source Location: (286:12,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (2355:85,0 [7] ) +Generated Location: (2363:85,0 [7] ) | } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs index 32dcd6e0819..67355394312 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,43) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Web -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt index d551442182b..256c2acd032 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt @@ -5,12 +5,12 @@ Generated Location: (372:12,0 [41] ) Source Location: (61:1,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) |OnComponentHover| -Generated Location: (1114:29,0 [16] ) +Generated Location: (1122:29,0 [16] ) |OnComponentHover| Source Location: (99:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) |ParentBgColor| -Generated Location: (1353:38,0 [13] ) +Generated Location: (1361:38,0 [13] ) |ParentBgColor| Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml) @@ -21,7 +21,7 @@ Source Location: (126:2,7 [130] x:\dir\subdir\Test\TestComponent.cshtml) { } | -Generated Location: (1609:49,0 [130] ) +Generated Location: (1617:49,0 [130] ) | public string ParentBgColor { get; set; } = "#FFFFFF"; diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs index e21b36595e1..63cc3b27e40 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs @@ -12,9 +12,9 @@ namespace Test #line (1,2)-(1,51) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.RenderTree; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt index d9a1d43a11a..2bd153a4dec 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.mappings.txt @@ -9,7 +9,7 @@ Source Location: (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml) if (__builder == null) output = "Builder is null!"; else output = "Builder is not null!"; | -Generated Location: (879:26,0 [134] ) +Generated Location: (887:26,0 [134] ) | var output = string.Empty; if (__builder == null) output = "Builder is null!"; @@ -18,11 +18,11 @@ Generated Location: (879:26,0 [134] ) Source Location: (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) |output| -Generated Location: (1279:40,0 [6] ) +Generated Location: (1287:40,0 [6] ) |output| Source Location: (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) || -Generated Location: (1472:49,0 [0] ) +Generated Location: (1480:49,0 [0] ) || diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs index 1def7e27bb0..6b0f44f7054 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.codegen.cs @@ -12,9 +12,9 @@ namespace Test #line (1,2)-(1,50) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Rendering; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt index 7db48c0a2e9..14883317a82 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeDirective/TestComponent.mappings.txt @@ -11,7 +11,7 @@ Source Location: (60:2,7 [213] x:\dir\subdir\Test\TestComponent.cshtml) if (__builder == null) output = "Builder is null!"; else output = "Builder is not null!"; | -Generated Location: (927:28,0 [213] ) +Generated Location: (935:28,0 [213] ) | void RenderChildComponent(RenderTreeBuilder __builder) { @@ -22,13 +22,13 @@ Generated Location: (927:28,0 [213] ) Source Location: (293:8,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) |output| -Generated Location: (1394:44,0 [6] ) +Generated Location: (1402:44,0 [6] ) |output| Source Location: (305:9,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (1581:53,0 [7] ) +Generated Location: (1589:53,0 [7] ) | } | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/UsingDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/UsingDirective/TestComponent.codegen.cs index d290615815c..eda9933d9e9 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/UsingDirective/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/UsingDirective/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,26) "x:\dir\subdir\Test\TestComponent.cshtml" using System.Collections -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs index a01e79a8a52..7a144a33d32 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs @@ -11,10 +11,10 @@ namespace Test #line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt index 635f5805af0..ff36719db7e 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt @@ -6,21 +6,21 @@ Generated Location: (320:11,0 [37] ) Source Location: (66:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (1140:32,0 [2] ) +Generated Location: (1148:32,0 [2] ) | | Source Location: (77:4,9 [51] x:\dir\subdir\Test\TestComponent.cshtml) |in code block RenderFragment template = | -Generated Location: (1376:42,0 [51] ) +Generated Location: (1384:42,0 [51] ) |in code block RenderFragment template = | Source Location: (134:5,36 [20] x:\dir\subdir\Test\TestComponent.cshtml) |in template; | -Generated Location: (1718:55,0 [20] ) +Generated Location: (1726:55,0 [20] ) |in template; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs index 1b65abbeddd..81318024554 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs @@ -11,10 +11,10 @@ namespace Test #line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt index e01641a66ed..3e559ac80a5 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt @@ -6,19 +6,19 @@ Generated Location: (320:11,0 [37] ) Source Location: (76:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (1140:32,0 [2] ) +Generated Location: (1148:32,0 [2] ) | | Source Location: (118:5,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = | -Generated Location: (1597:46,0 [30] ) +Generated Location: (1605:46,0 [30] ) | RenderFragment template = | Source Location: (181:5,63 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (2155:62,0 [3] ) +Generated Location: (2163:62,0 [3] ) |; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.codegen.cs index 42e38b0fcee..7608dda1bdd 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.codegen.cs @@ -11,10 +11,10 @@ namespace Test #line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.mappings.txt index d1a98b3a81f..6028a02e058 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_NoMatchingComponent/TestComponent.mappings.txt @@ -6,21 +6,21 @@ Generated Location: (320:11,0 [37] ) Source Location: (66:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (958:29,0 [2] ) +Generated Location: (966:29,0 [2] ) | | Source Location: (77:4,9 [51] x:\dir\subdir\Test\TestComponent.cshtml) |in code block RenderFragment template = | -Generated Location: (1179:39,0 [51] ) +Generated Location: (1187:39,0 [51] ) |in code block RenderFragment template = | Source Location: (134:5,36 [20] x:\dir\subdir\Test\TestComponent.cshtml) |in template; | -Generated Location: (1506:52,0 [20] ) +Generated Location: (1514:52,0 [20] ) |in template; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs index 6fd53e7589c..648b1868f18 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs @@ -11,10 +11,10 @@ namespace Test #line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt index ab2805c8433..a2fc0fa4645 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt @@ -6,19 +6,19 @@ Generated Location: (320:11,0 [37] ) Source Location: (53:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (922:28,0 [2] ) +Generated Location: (930:28,0 [2] ) | | Source Location: (68:5,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = | -Generated Location: (1157:38,0 [30] ) +Generated Location: (1165:38,0 [30] ) | RenderFragment template = | Source Location: (106:5,38 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1478:50,0 [3] ) +Generated Location: (1486:50,0 [3] ) |; | diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs index 6f1f52997c4..b08d084da9b 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs @@ -12,10 +12,10 @@ namespace Test #line (1,2)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml" using Microsoft.AspNetCore.Components.Rendering -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt index 0f6d5da59d2..e3172674dab 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_InMarkupInFunctionsBlock/TestComponent.mappings.txt @@ -8,7 +8,7 @@ Source Location: (57:1,7 [57] x:\dir\subdir\Test\TestComponent.cshtml) void MyMethod(RenderTreeBuilder __builder) { | -Generated Location: (933:29,0 [57] ) +Generated Location: (941:29,0 [57] ) | void MyMethod(RenderTreeBuilder __builder) { @@ -16,34 +16,34 @@ Generated Location: (933:29,0 [57] ) Source Location: (128:5,0 [12] x:\dir\subdir\Test\TestComponent.cshtml) | | -Generated Location: (1164:40,0 [12] ) +Generated Location: (1172:40,0 [12] ) | | Source Location: (141:5,13 [46] x:\dir\subdir\Test\TestComponent.cshtml) |for (var i = 0; i < 100; i++) { | -Generated Location: (1311:48,0 [46] ) +Generated Location: (1319:48,0 [46] ) |for (var i = 0; i < 100; i++) { | Source Location: (230:8,21 [1] x:\dir\subdir\Test\TestComponent.cshtml) |i| -Generated Location: (1566:59,0 [1] ) +Generated Location: (1574:59,0 [1] ) |i| Source Location: (256:10,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (1748:68,0 [15] ) +Generated Location: (1756:68,0 [15] ) | } | Source Location: (286:12,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) | } | -Generated Location: (1932:77,0 [7] ) +Generated Location: (1940:77,0 [7] ) | } | diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/RuntimeNodeWriter.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/RuntimeNodeWriter.cs index 192aef52c54..341c66d0d8e 100644 --- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/RuntimeNodeWriter.cs +++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/RuntimeNodeWriter.cs @@ -33,7 +33,7 @@ public override void WriteUsingDirective(CodeRenderingContext context, UsingDire { if (node.Source is { FilePath: not null } sourceSpan) { - using (context.CodeWriter.BuildEnhancedLinePragma(sourceSpan, context, suppressLineDefaultAndHidden: !node.AppendLineDefaultAndHidden)) + using (context.CodeWriter.BuildEnhancedLinePragma(sourceSpan, context, suppressLineDefaultAndHidden: true)) { context.CodeWriter.WriteUsing(node.Content, endLine: node.HasExplicitSemicolon); } @@ -41,6 +41,11 @@ public override void WriteUsingDirective(CodeRenderingContext context, UsingDire { context.CodeWriter.WriteLine(";"); } + if (node.AppendLineDefaultAndHidden) + { + context.CodeWriter.WriteLine("#line default"); + context.CodeWriter.WriteLine("#line hidden"); + } } else { diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs index a2568b075b5..e2a699ff7fb 100644 --- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs +++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs @@ -330,7 +330,7 @@ public override void WriteUsingDirective(CodeRenderingContext context, UsingDire if (node.Source is { FilePath: not null } sourceSpan) { - using (context.CodeWriter.BuildEnhancedLinePragma(sourceSpan, context, suppressLineDefaultAndHidden: !node.AppendLineDefaultAndHidden)) + using (context.CodeWriter.BuildEnhancedLinePragma(sourceSpan, context, suppressLineDefaultAndHidden: true)) { context.CodeWriter.WriteUsing(node.Content, endLine: node.HasExplicitSemicolon); } @@ -338,6 +338,11 @@ public override void WriteUsingDirective(CodeRenderingContext context, UsingDire { context.CodeWriter.WriteLine(";"); } + if (node.AppendLineDefaultAndHidden) + { + context.CodeWriter.WriteLine("#line default"); + context.CodeWriter.WriteLine("#line hidden"); + } } else { diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs index 4ec107ded3e..aa1323c24d2 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs @@ -1062,9 +1062,9 @@ namespace MyApp.Pages #line (2,2)-(2,33) ""Pages/Index.razor"" using SurveyPromptRootNamspace; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class Index : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable @@ -1135,9 +1135,9 @@ namespace MyApp.Pages #line (2,2)-(2,33) ""Pages/Index.razor"" using SurveyPromptRootNamspace; -#line default -#line hidden #nullable disable + #line default + #line hidden #nullable restore public partial class Index : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1_Component1_razor.g.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1_Component1_razor.g.cs index 58840281074..ca548dbbfcb 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1_Component1_razor.g.cs +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1_Component1_razor.g.cs @@ -13,10 +13,10 @@ namespace MyApp.Folder1 #line (1,2)-(1,36) "Folder1/_Imports.razor" using MyApp.MyNamespace.AndAnother -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class Component1 : global::Microsoft.AspNetCore.Components.ComponentBase #nullable disable diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1__Imports_razor.g.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1__Imports_razor.g.cs index 3a32131235b..907c6ca743b 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1__Imports_razor.g.cs +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor/Folder1__Imports_razor.g.cs @@ -13,10 +13,10 @@ namespace MyApp.Folder1 #line (1,2)-(1,36) "Folder1/_Imports.razor" using MyApp.MyNamespace.AndAnother -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class _Imports : object #nullable disable diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_SystemInNamespace/System__Imports_razor.g.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_SystemInNamespace/System__Imports_razor.g.cs index 83a9570411e..bc8fd4f13ae 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_SystemInNamespace/System__Imports_razor.g.cs +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_SystemInNamespace/System__Imports_razor.g.cs @@ -13,10 +13,10 @@ namespace MyApp.System #line (1,2)-(1,31) "System/_Imports.razor" using global::System.Net.Http -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class _Imports : object #nullable disable diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_WithMarkup/_Imports_razor.g.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_WithMarkup/_Imports_razor.g.cs index 008aee425ac..c417b2d8cf5 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_WithMarkup/_Imports_razor.g.cs +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/ImportsRazor_WithMarkup/_Imports_razor.g.cs @@ -13,10 +13,10 @@ namespace MyApp #line (1,2)-(1,23) "_Imports.razor" using System.Net.Http -#line default -#line hidden #nullable disable ; + #line default + #line hidden #nullable restore public partial class _Imports : object #nullable disable From a5c9f5de0fd5686564fa09965df21d5fb74602c9 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 24 Dec 2024 09:47:56 +1100 Subject: [PATCH 8/9] Add extra test to validate the things that don't need to get skipped at least --- .../CohostSemanticTokensRangeEndpointTest.cs | 25 ++++++++++ .../SemanticTokens/Legacy_Compatibility.txt | 42 ++++++++++++++++ .../Legacy_Compatibility_with_background.txt | 48 +++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility.txt create mode 100644 src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility_with_background.txt diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs index 8c76f90977d..29de8c2a9fd 100644 --- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs @@ -89,6 +89,31 @@ @section MySection { await VerifySemanticTokensAsync(input, colorBackground, precise, fileKind: FileKinds.Legacy); } + [FuseTheory] + [CombinatorialData] + public async Task Legacy_Compatibility(bool colorBackground, bool precise) + { + // Same test as above, but with only the things that work in FUSE and non-FUSE, to prevent regressions + + var input = """ + @page "/" + @using System + +
This is some HTML
+ + + + @functions + { + public void M() + { + } + } + """; + + await VerifySemanticTokensAsync(input, colorBackground, precise, fileKind: FileKinds.Legacy); + } + private async Task VerifySemanticTokensAsync(string input, bool colorBackground, bool precise, string? fileKind = null, [CallerMemberName] string? testName = null) { UpdateClientInitializationOptions(c => c with { ForceRuntimeCodeGeneration = context.ForceRuntimeCodeGeneration }); diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility.txt new file mode 100644 index 00000000000..d4a7b234772 --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility.txt @@ -0,0 +1,42 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 4 razorDirective [] [page] +0 5 3 string [] ["/"] +1 0 1 razorTransition [] [@] +0 1 5 keyword [] [using] +0 6 6 namespace name [] [System] +2 0 1 markupTagDelimiter [] [<] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +0 18 1 markupTagDelimiter [] [<] +0 1 1 markupTagDelimiter [] [/] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +2 0 1 markupTagDelimiter [] [<] +0 1 9 razorTagHelperElement [] [component] +0 10 4 razorTagHelperAttribute [] [type] +0 4 1 markupOperator [] [=] +0 1 1 markupAttributeQuote [] ["] +0 1 6 keyword [] [typeof] +0 6 1 punctuation [] [(] +0 1 9 property name [] [Component] +0 9 1 punctuation [] [)] +0 1 1 markupAttributeQuote [] ["] +0 2 11 razorTagHelperAttribute [] [render-mode] +0 11 1 markupOperator [] [=] +0 1 1 markupAttributeQuote [] ["] +0 1 17 enum member name [] [ServerPrerendered] +0 17 1 markupAttributeQuote [] ["] +0 2 1 markupTagDelimiter [] [/] +0 1 1 markupTagDelimiter [] [>] +2 0 1 razorTransition [] [@] +0 1 9 razorDirective [] [functions] +1 0 1 razorTransition [] [{] +1 4 6 keyword [] [public] +0 7 4 keyword [] [void] +0 5 1 method name [] [M] +0 1 1 punctuation [] [(] +0 1 1 punctuation [] [)] +1 4 1 punctuation [] [{] +1 4 1 punctuation [] [}] +1 0 1 razorTransition [] [}] diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility_with_background.txt b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility_with_background.txt new file mode 100644 index 00000000000..7177539737f --- /dev/null +++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TestFiles/SemanticTokens/Legacy_Compatibility_with_background.txt @@ -0,0 +1,48 @@ +Line Δ, Char Δ, Length, Type, Modifier(s), Text +0 0 1 razorTransition [] [@] +0 1 4 razorDirective [] [page] +0 5 3 string [razorCode] ["/"] +1 0 1 razorTransition [] [@] +0 1 5 keyword [razorCode] [using] +0 5 1 markupTextLiteral [razorCode] [ ] +0 1 6 namespace name [razorCode] [System] +2 0 1 markupTagDelimiter [] [<] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +0 18 1 markupTagDelimiter [] [<] +0 1 1 markupTagDelimiter [] [/] +0 1 3 markupElement [] [div] +0 3 1 markupTagDelimiter [] [>] +2 0 1 markupTagDelimiter [] [<] +0 1 9 razorTagHelperElement [] [component] +0 10 4 razorTagHelperAttribute [] [type] +0 4 1 markupOperator [] [=] +0 1 1 markupAttributeQuote [] ["] +0 1 6 keyword [razorCode] [typeof] +0 6 1 punctuation [razorCode] [(] +0 1 9 property name [razorCode] [Component] +0 9 1 punctuation [razorCode] [)] +0 1 1 markupAttributeQuote [] ["] +0 2 11 razorTagHelperAttribute [] [render-mode] +0 11 1 markupOperator [] [=] +0 1 1 markupAttributeQuote [] ["] +0 1 17 enum member name [razorCode] [ServerPrerendered] +0 17 1 markupAttributeQuote [] ["] +0 2 1 markupTagDelimiter [] [/] +0 1 1 markupTagDelimiter [] [>] +2 0 1 razorTransition [] [@] +0 1 9 razorDirective [] [functions] +1 0 1 razorTransition [] [{] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 6 keyword [razorCode] [public] +0 6 1 markupTextLiteral [razorCode] [ ] +0 1 4 keyword [razorCode] [void] +0 4 1 markupTextLiteral [razorCode] [ ] +0 1 1 method name [razorCode] [M] +0 1 1 punctuation [razorCode] [(] +0 1 1 punctuation [razorCode] [)] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 1 punctuation [razorCode] [{] +1 0 4 markupTextLiteral [razorCode] [ ] +0 4 1 punctuation [razorCode] [}] +1 0 1 razorTransition [] [}] From a123a9b0eeded90d76a700b419aa567018ec35be Mon Sep 17 00:00:00 2001 From: David Wengier Date: Fri, 27 Dec 2024 08:36:27 +1100 Subject: [PATCH 9/9] PR feedback --- .../Microsoft.AspNetCore.Razor.Test.Common.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj index 9d437014ddc..389e6c60fee 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -40,8 +40,4 @@ - - - -