From a6d2c04195974fbafa69abec61d46d6d2ed919d2 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 7 Jun 2017 12:11:55 -0700 Subject: [PATCH] [Fixes #1379] Rename CSharpStatement to CSharpCode --- .../AssemblyAttributeInjectionPass.cs | 2 +- .../InstrumentationPass.cs | 4 +- .../PagesPropertyInjectionPass.cs | 4 +- .../ViewComponentTagHelperPass.cs | 2 +- .../CodeGeneration/BasicWriter.cs | 4 +- .../CodeGeneration/DefaultDocumentWriter.cs | 8 +- .../CodeGeneration/DesignTimeBasicWriter.cs | 4 +- .../DesignTimeTagHelperWriter.cs | 2 +- .../CodeGeneration/RuntimeBasicWriter.cs | 6 +- .../CodeGeneration/RuntimeTagHelperWriter.cs | 6 +- .../DefaultDirectiveIRPass.cs | 4 +- .../DefaultRazorIRLoweringPhase.cs | 6 +- ...e.cs => CSharpCodeAttributeValueIRNode.cs} | 4 +- ...StatementIRNode.cs => CSharpCodeIRNode.cs} | 4 +- .../Intermediate/RazorIRNodeVisitor.cs | 4 +- .../RazorDesignTimeIRPass.cs | 2 +- .../AssemblyAttributeInjectionPassTest.cs | 16 ++-- .../Basic_DesignTime.ir.txt | 8 +- .../Basic_Runtime.ir.txt | 34 ++++---- .../IncompleteDirectives_DesignTime.ir.txt | 6 +- .../IncompleteDirectives_Runtime.ir.txt | 40 ++++----- .../InheritsViewModel_DesignTime.ir.txt | 4 +- .../InheritsViewModel_Runtime.ir.txt | 2 +- .../InheritsWithViewImports_DesignTime.ir.txt | 8 +- .../InheritsWithViewImports_Runtime.ir.txt | 6 +- .../InjectWithModel_DesignTime.ir.txt | 4 +- .../InjectWithModel_Runtime.ir.txt | 2 +- .../InjectWithSemicolon_DesignTime.ir.txt | 4 +- .../InjectWithSemicolon_Runtime.ir.txt | 2 +- .../Inject_DesignTime.ir.txt | 4 +- .../Inject_Runtime.ir.txt | 2 +- .../InvalidNamespaceAtEOF_DesignTime.ir.txt | 2 +- .../InvalidNamespaceAtEOF_Runtime.ir.txt | 4 +- .../MalformedPageDirective_DesignTime.ir.txt | 8 +- .../MalformedPageDirective_Runtime.ir.txt | 10 +-- ...ModelExpressionTagHelper_DesignTime.ir.txt | 4 +- .../ModelExpressionTagHelper_Runtime.ir.txt | 26 +++--- .../Model_DesignTime.ir.txt | 4 +- .../Model_Runtime.ir.txt | 2 +- .../MultipleModels_DesignTime.ir.txt | 4 +- .../PageWithNamespace_DesignTime.ir.txt | 8 +- .../PageWithNamespace_Runtime.ir.txt | 10 +-- .../RazorPagesWithoutModel_DesignTime.ir.txt | 10 +-- .../RazorPagesWithoutModel_Runtime.ir.txt | 84 +++++++++---------- .../RazorPages_DesignTime.ir.txt | 10 +-- .../RazorPages_Runtime.ir.txt | 84 +++++++++---------- .../ViewComponentTagHelper_DesignTime.ir.txt | 8 +- .../ViewComponentTagHelper_Runtime.ir.txt | 14 ++-- .../ViewWithNamespace_DesignTime.ir.txt | 4 +- .../ViewWithNamespace_Runtime.ir.txt | 6 +- .../_ViewImports_DesignTime.ir.txt | 4 +- .../_ViewImports_Runtime.ir.txt | 2 +- .../BasicTest.ir.txt | 44 +++++----- .../ViewComponentTagHelperPassTest.cs | 8 +- .../DesignTimeBasicWriterTest.cs | 42 +++++----- .../CodeGeneration/RuntimeBasicWriterTest.cs | 30 +++---- ...lperHtmlAttributeRuntimeBasicWriterTest.cs | 6 +- .../DefaultDirectiveIRPassTest.cs | 10 +-- ...aultRazorIRLoweringPhaseIntegrationTest.cs | 2 +- .../DocumentClassifierPassBaseTest.cs | 8 +- .../CodeGenerationIntegrationTest.cs | 14 ++++ .../TestTagHelperDescriptors.cs | 40 +++++++++ .../AddTagHelperDirective_DesignTime.ir.txt | 2 +- ...ibuteTargetingTagHelpers_DesignTime.ir.txt | 2 +- .../Await_DesignTime.ir.txt | 18 ++-- .../Await_Runtime.ir.txt | 12 +-- .../BasicImports_DesignTime.ir.txt | 2 +- .../BasicTagHelpers_DesignTime.ir.txt | 2 +- ...BasicTagHelpers_Prefixed_DesignTime.ir.txt | 2 +- .../Blocks_DesignTime.ir.txt | 32 +++---- .../Blocks_Runtime.ir.txt | 30 +++---- .../CSharp7_DesignTime.ir.txt | 10 +-- .../CSharp7_Runtime.ir.txt | 14 ++-- .../CodeBlockAtEOF_DesignTime.ir.txt | 4 +- .../CodeBlockAtEOF_Runtime.ir.txt | 2 +- ...CodeBlockWithTextElement_DesignTime.ir.txt | 8 +- .../CodeBlockWithTextElement_Runtime.ir.txt | 6 +- .../CodeBlock_DesignTime.ir.txt | 4 +- .../CodeBlock_Runtime.ir.txt | 2 +- .../ComplexTagHelpers_DesignTime.ir.txt | 30 +++---- .../ComplexTagHelpers_Runtime.ir.txt | 28 +++---- .../ConditionalAttributes_DesignTime.ir.txt | 28 +++---- .../ConditionalAttributes_Runtime.ir.txt | 6 +- .../DesignTime_DesignTime.ir.txt | 10 +-- ...icateAttributeTagHelpers_DesignTime.ir.txt | 2 +- ...icateTargetTagHelper_DesignTime.codegen.cs | 4 +- ...DuplicateTargetTagHelper_DesignTime.ir.txt | 31 ++++--- ...ateTargetTagHelper_DesignTime.mappings.txt | 4 +- ...uplicateTargetTagHelper_Runtime.codegen.cs | 4 +- .../DuplicateTargetTagHelper_Runtime.ir.txt | 16 ++-- ...namicAttributeTagHelpers_DesignTime.ir.txt | 14 ++-- .../DynamicAttributeTagHelpers_Runtime.ir.txt | 12 +-- ...EmptyAttributeTagHelpers_DesignTime.ir.txt | 2 +- .../EmptyCodeBlock_DesignTime.ir.txt | 4 +- .../EmptyCodeBlock_Runtime.ir.txt | 2 +- .../EmptyExplicitExpression_DesignTime.ir.txt | 2 +- ...ImplicitExpressionInCode_DesignTime.ir.txt | 6 +- ...ptyImplicitExpressionInCode_Runtime.ir.txt | 4 +- .../EmptyImplicitExpression_DesignTime.ir.txt | 2 +- .../EnumTagHelpers_DesignTime.ir.txt | 4 +- .../EnumTagHelpers_Runtime.ir.txt | 2 +- .../EscapedTagHelpers_DesignTime.ir.txt | 2 +- .../ExplicitExpressionAtEOF_DesignTime.ir.txt | 2 +- ...icitExpressionWithMarkup_DesignTime.ir.txt | 2 +- .../ExplicitExpression_DesignTime.ir.txt | 2 +- .../ExpressionsInCode_DesignTime.ir.txt | 14 ++-- .../ExpressionsInCode_Runtime.ir.txt | 12 +-- .../FunctionsBlockMinimal_DesignTime.ir.txt | 4 +- .../FunctionsBlockMinimal_Runtime.ir.txt | 4 +- .../FunctionsBlock_DesignTime.ir.txt | 6 +- .../FunctionsBlock_Runtime.ir.txt | 4 +- .../HiddenSpansInCode_DesignTime.ir.txt | 6 +- .../HiddenSpansInCode_Runtime.ir.txt | 4 +- ...lCommentWithQuote_Double_DesignTime.ir.txt | 2 +- ...lCommentWithQuote_Single_DesignTime.ir.txt | 2 +- .../ImplicitExpressionAtEOF_DesignTime.ir.txt | 2 +- .../ImplicitExpression_DesignTime.ir.txt | 6 +- .../ImplicitExpression_Runtime.ir.txt | 4 +- .../IncompleteDirectives_DesignTime.ir.txt | 14 ++-- .../IncompleteDirectives_Runtime.ir.txt | 12 +-- .../IncompleteTagHelper_DesignTime.ir.txt | 2 +- .../Inherits_DesignTime.ir.txt | 2 +- .../InlineBlocks_DesignTime.ir.txt | 8 +- .../InlineBlocks_Runtime.ir.txt | 6 +- .../Instrumented_DesignTime.ir.txt | 38 ++++----- .../Instrumented_Runtime.ir.txt | 34 ++++---- .../MarkupInCodeBlock_DesignTime.ir.txt | 6 +- .../MarkupInCodeBlock_Runtime.ir.txt | 4 +- .../MinimizedTagHelpers_DesignTime.ir.txt | 2 +- .../NestedCSharp_DesignTime.ir.txt | 10 +-- .../NestedCSharp_Runtime.ir.txt | 8 +- .../NestedCodeBlocks_DesignTime.ir.txt | 8 +- .../NestedCodeBlocks_Runtime.ir.txt | 6 +- ...estedScriptTagTagHelpers_DesignTime.ir.txt | 6 +- .../NestedScriptTagTagHelpers_Runtime.ir.txt | 6 +- .../NestedTagHelpers_DesignTime.ir.txt | 2 +- .../NoLinePragmas_DesignTime.ir.txt | 34 ++++---- .../NoLinePragmas_Runtime.ir.txt | 32 +++---- ...llConditionalExpressions_DesignTime.ir.txt | 12 +-- .../NullConditionalExpressions_Runtime.ir.txt | 10 +-- .../OpenedIf_DesignTime.ir.txt | 8 +- .../OpenedIf_Runtime.ir.txt | 4 +- .../ParserError_DesignTime.ir.txt | 4 +- .../ParserError_Runtime.ir.txt | 2 +- ...fixedAttributeTagHelpers_DesignTime.ir.txt | 4 +- ...PrefixedAttributeTagHelpers_Runtime.ir.txt | 2 +- .../RazorComments_DesignTime.ir.txt | 10 +-- .../RazorComments_Runtime.ir.txt | 8 +- ...RemoveTagHelperDirective_DesignTime.ir.txt | 2 +- .../Sections_DesignTime.ir.txt | 20 ++--- .../Sections_Runtime.ir.txt | 20 ++--- .../SimpleTagHelpers_DesignTime.ir.txt | 2 +- .../SimpleUnspacedIf_DesignTime.ir.txt | 6 +- .../SimpleUnspacedIf_Runtime.ir.txt | 4 +- ...hNewlineBeforeAttributes_DesignTime.ir.txt | 2 +- .../SingleTagHelper_DesignTime.ir.txt | 2 +- .../StringLiterals_DesignTime.ir.txt | 10 +-- .../StringLiterals_Runtime.ir.txt | 8 +- .../SymbolBoundAttributes_DesignTime.ir.txt | 2 +- .../TagHelpersInSection_Runtime.ir.txt | 6 +- ...lpersWithBoundAttributes_DesignTime.ir.txt | 2 +- .../TagHelpersWithPrefix_DesignTime.ir.txt | 2 +- .../TagHelpersWithTemplate_DesignTime.ir.txt | 8 +- .../TagHelpersWithTemplate_Runtime.ir.txt | 8 +- ...hWeirdlySpacedAttributes_DesignTime.ir.txt | 2 +- .../Templates_DesignTime.ir.txt | 18 ++-- .../Templates_Runtime.ir.txt | 18 ++-- ...onsInTagHelperAttributes_DesignTime.ir.txt | 6 +- ...itionsInTagHelperAttributes_Runtime.ir.txt | 4 +- ...finishedExpressionInCode_DesignTime.ir.txt | 6 +- .../UnfinishedExpressionInCode_Runtime.ir.txt | 4 +- .../Usings_DesignTime.ir.txt | 2 +- .../NamespaceToken.ir.txt | 2 +- .../IntegrationTests/RazorIRNodeWriter.cs | 2 +- .../Langauge/Intermediate/RazorIRAssert.cs | 8 +- 175 files changed, 846 insertions(+), 801 deletions(-) rename src/Microsoft.AspNetCore.Razor.Language/Intermediate/{CSharpStatementAttributeValueIRNode.cs => CSharpCodeAttributeValueIRNode.cs} (86%) rename src/Microsoft.AspNetCore.Razor.Language/Intermediate/{CSharpStatementIRNode.cs => CSharpCodeIRNode.cs} (90%) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs index e0c7d28d8c..aea8fe86c3 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var index = irDocument.Children.IndexOf(@namespace); Debug.Assert(index >= 0); - var pageAttribute = new CSharpStatementIRNode(); + var pageAttribute = new CSharpCodeIRNode(); RazorIRBuilder.Create(pageAttribute) .Add(new RazorIRToken() { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs index 2915ee8015..1ae1ef0969 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var beginContextMethodName = "BeginContext"; /* ORIGINAL: BeginContextMethodName */ var endContextMethodName = "EndContext"; /* ORIGINAL: EndContextMethodName */ - var beginNode = new CSharpStatementIRNode() + var beginNode = new CSharpCodeIRNode() { Parent = item.Node.Parent }; @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions item.IsLiteral ? "true" : "false") }); - var endNode = new CSharpStatementIRNode() + var endNode = new CSharpCodeIRNode() { Parent = item.Node.Parent }; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs index 8be19e9d39..ebfffc63ee 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var @class = visitor.Class; var viewDataType = $"global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<{modelType}>"; - var vddProperty = new CSharpStatementIRNode() + var vddProperty = new CSharpCodeIRNode() { Parent = @class }; @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions }); @class.Children.Add(vddProperty); - var modelProperty = new CSharpStatementIRNode() + var modelProperty = new CSharpCodeIRNode() { Parent = @class }; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs index c30556ab3b..9bc4dd44a0 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var writer = new CSharpCodeWriter(); WriteClass(writer, tagHelper); - var statement = new CSharpStatementIRNode() + var statement = new CSharpCodeIRNode() { Parent = @class }; diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs index 9f8af2de06..d5502e55bb 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public abstract void WriteCSharpExpression(CSharpRenderingContext context, CSharpExpressionIRNode node); - public abstract void WriteCSharpStatement(CSharpRenderingContext context, CSharpStatementIRNode node); + public abstract void WriteCSharpCode(CSharpRenderingContext context, CSharpCodeIRNode node); public abstract void WriteHtmlContent(CSharpRenderingContext context, HtmlContentIRNode node); @@ -23,6 +23,6 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public abstract void WriteCSharpExpressionAttributeValue(CSharpRenderingContext context, CSharpExpressionAttributeValueIRNode node); - public abstract void WriteCSharpStatementAttributeValue(CSharpRenderingContext context, CSharpStatementAttributeValueIRNode node); + public abstract void WriteCSharpCodeAttributeValue(CSharpRenderingContext context, CSharpCodeAttributeValueIRNode node); } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs index da7d5e431b..7a9c24108c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs @@ -194,9 +194,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration Context.BasicWriter.WriteCSharpExpression(Context, node); } - public override void VisitCSharpStatement(CSharpStatementIRNode node) + public override void VisitCSharpCode(CSharpCodeIRNode node) { - Context.BasicWriter.WriteCSharpStatement(Context, node); + Context.BasicWriter.WriteCSharpCode(Context, node); } public override void VisitHtmlAttribute(HtmlAttributeIRNode node) @@ -214,9 +214,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration Context.BasicWriter.WriteCSharpExpressionAttributeValue(Context, node); } - public override void VisitCSharpStatementAttributeValue(CSharpStatementAttributeValueIRNode node) + public override void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIRNode node) { - Context.BasicWriter.WriteCSharpStatementAttributeValue(Context, node); + Context.BasicWriter.WriteCSharpCodeAttributeValue(Context, node); } public override void VisitHtml(HtmlContentIRNode node) diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs index c891644bed..00b5392458 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs @@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration } } - public override void WriteCSharpStatement(CSharpRenderingContext context, CSharpStatementIRNode node) + public override void WriteCSharpCode(CSharpRenderingContext context, CSharpCodeIRNode node) { var isWhitespaceStatement = true; for (var i = 0; i < node.Children.Count; i++) @@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration } } - public override void WriteCSharpStatementAttributeValue(CSharpRenderingContext context, CSharpStatementAttributeValueIRNode node) + public override void WriteCSharpCodeAttributeValue(CSharpRenderingContext context, CSharpCodeAttributeValueIRNode node) { for (var i = 0; i < node.Children.Count; i++) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeTagHelperWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeTagHelperWriter.cs index 83885b9a28..2843b9e356 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeTagHelperWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeTagHelperWriter.cs @@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration context.Writer.Write(token.Content); } - else if (node is CSharpStatementIRNode) + else if (node is CSharpCodeIRNode) { var error = new RazorError( LegacyResources.TagHelpers_CodeBlocks_NotSupported_InAttributes, diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs index 50236d7407..7867e1f099 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs @@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration linePragmaScope?.Dispose(); } - public override void WriteCSharpStatement(CSharpRenderingContext context, CSharpStatementIRNode node) + public override void WriteCSharpCode(CSharpRenderingContext context, CSharpCodeIRNode node) { var isWhitespaceStatement = true; for (var i = 0; i < node.Children.Count; i++) @@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration .Count(child => child is HtmlAttributeValueIRNode || child is CSharpExpressionAttributeValueIRNode || - child is CSharpStatementAttributeValueIRNode || + child is CSharpCodeAttributeValueIRNode || child is ExtensionIRNode); var prefixLocation = node.Source.Value.AbsoluteIndex; @@ -251,7 +251,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration } } - public override void WriteCSharpStatementAttributeValue(CSharpRenderingContext context, CSharpStatementAttributeValueIRNode node) + public override void WriteCSharpCodeAttributeValue(CSharpRenderingContext context, CSharpCodeAttributeValueIRNode node) { const string ValueWriterName = "__razor_attribute_value_writer"; diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs index 5367ec5bb7..acf5d74d4e 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs @@ -243,7 +243,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { var attributeValueStyleParameter = $"{HtmlAttributeValueStyleTypeName}.{node.ValueStyle}"; var isConditionalAttributeValue = node.Children.Any( - child => child is CSharpExpressionAttributeValueIRNode || child is CSharpStatementAttributeValueIRNode); + child => child is CSharpExpressionAttributeValueIRNode || child is CSharpCodeAttributeValueIRNode); // All simple text and minimized attributes will be pre-allocated. if (isConditionalAttributeValue) @@ -257,7 +257,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration child => child is HtmlAttributeValueIRNode || child is CSharpExpressionAttributeValueIRNode || - child is CSharpStatementAttributeValueIRNode || + child is CSharpCodeAttributeValueIRNode || child is ExtensionIRNode); context.Writer @@ -435,7 +435,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { context.Writer.Write(token.Content); } - else if (node is CSharpStatementIRNode) + else if (node is CSharpCodeIRNode) { var error = new RazorError( LegacyResources.TagHelpers_CodeBlocks_NotSupported_InAttributes, diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs index d441d85adc..c0d5c1cbbe 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Razor.Language var sectionIndex = node.Parent.Children.IndexOf(node); node.Parent.Children.Remove(node); - var defineSectionEndStatement = new CSharpStatementIRNode(); + var defineSectionEndStatement = new CSharpCodeIRNode(); RazorIRBuilder.Create(defineSectionEndStatement) .Add(new RazorIRToken() { @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language var lambdaContent = designTime ? "__razor_section_writer" : string.Empty; var sectionName = node.Tokens.FirstOrDefault()?.Content; - var defineSectionStartStatement = new CSharpStatementIRNode(); + var defineSectionStartStatement = new CSharpCodeIRNode(); RazorIRBuilder.Create(defineSectionStartStatement) .Add(new RazorIRToken() { diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs index cd941a851f..e1aa470d32 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs @@ -306,7 +306,7 @@ namespace Microsoft.AspNetCore.Razor.Language } else { - _builder.Push(new CSharpStatementAttributeValueIRNode() + _builder.Push(new CSharpCodeAttributeValueIRNode() { Prefix = chunkGenerator.Prefix, Source = BuildSourceSpanFromNode(block), @@ -433,11 +433,11 @@ namespace Microsoft.AspNetCore.Razor.Language public override void VisitStatementSpan(StatementChunkGenerator chunkGenerator, Span span) { - var isAttributeValue = _builder.Current is CSharpStatementAttributeValueIRNode; + var isAttributeValue = _builder.Current is CSharpCodeAttributeValueIRNode; if (!isAttributeValue) { - var statementNode = new CSharpStatementIRNode() + var statementNode = new CSharpCodeIRNode() { Source = BuildSourceSpanFromNode(span) }; diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpStatementAttributeValueIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeAttributeValueIRNode.cs similarity index 86% rename from src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpStatementAttributeValueIRNode.cs rename to src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeAttributeValueIRNode.cs index 5b64d9b63f..6b57ec7a6f 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpStatementAttributeValueIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeAttributeValueIRNode.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { - public sealed class CSharpStatementAttributeValueIRNode : RazorIRNode + public sealed class CSharpCodeAttributeValueIRNode : RazorIRNode { public override ItemCollection Annotations => ReadOnlyItemCollection.Empty; @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate throw new ArgumentNullException(nameof(visitor)); } - visitor.VisitCSharpStatementAttributeValue(this); + visitor.VisitCSharpCodeAttributeValue(this); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpStatementIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeIRNode.cs similarity index 90% rename from src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpStatementIRNode.cs rename to src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeIRNode.cs index 765ea3dcaf..4df3e287f3 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpStatementIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeIRNode.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { - public sealed class CSharpStatementIRNode : RazorIRNode + public sealed class CSharpCodeIRNode : RazorIRNode { private ItemCollection _annotations; @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate throw new ArgumentNullException(nameof(visitor)); } - visitor.VisitCSharpStatement(this); + visitor.VisitCSharpCode(this); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/RazorIRNodeVisitor.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/RazorIRNodeVisitor.cs index 373f061b9f..6d32f23703 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/RazorIRNodeVisitor.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/RazorIRNodeVisitor.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate VisitDefault(node); } - public virtual void VisitCSharpStatement(CSharpStatementIRNode node) + public virtual void VisitCSharpCode(CSharpCodeIRNode node) { VisitDefault(node); } @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate VisitDefault(node); } - public virtual void VisitCSharpStatementAttributeValue(CSharpStatementAttributeValueIRNode node) + public virtual void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIRNode node) { VisitDefault(node); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs index 2ba58e8c7d..229b2fd999 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language public override void VisitClassDeclaration(ClassDeclarationIRNode node) { - var designTimeHelperDeclaration = new CSharpStatementIRNode(); + var designTimeHelperDeclaration = new CSharpCodeIRNode(); RazorIRBuilder.Create(designTimeHelperDeclaration) .Add(new RazorIRToken() { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs index da7d9cb215..d6ed09c907 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs @@ -185,8 +185,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions Assert.Collection(irDocument.Children, node => { - var csharpStatement = Assert.IsType(node); - var token = Assert.IsType(Assert.Single(csharpStatement.Children)); + var csharpCode = Assert.IsType(node); + var token = Assert.IsType(Assert.Single(csharpCode.Children)); Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind); Assert.Equal(expectedAttribute, token.Content); }, @@ -236,8 +236,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions Assert.Collection(irDocument.Children, node => { - var csharpStatement = Assert.IsType(node); - var token = Assert.IsType(Assert.Single(csharpStatement.Children)); + var csharpCode = Assert.IsType(node); + var token = Assert.IsType(Assert.Single(csharpCode.Children)); Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind); Assert.Equal(expectedAttribute, token.Content); }, @@ -294,8 +294,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions node => Assert.Same(pageDirective, node), node => { - var csharpStatement = Assert.IsType(node); - var token = Assert.IsType(Assert.Single(csharpStatement.Children)); + var csharpCode = Assert.IsType(node); + var token = Assert.IsType(Assert.Single(csharpCode.Children)); Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind); Assert.Equal(expectedAttribute, token.Content); }, @@ -346,8 +346,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions Assert.Collection(irDocument.Children, node => { - var csharpStatement = Assert.IsType(node); - var token = Assert.IsType(Assert.Single(csharpStatement.Children)); + var csharpCode = Assert.IsType(node); + var token = Assert.IsType(Assert.Single(csharpCode.Children)); Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind); Assert.Equal(expectedAttribute, token.Content); }, diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt index 2d75749ecc..1c092f928f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -26,7 +26,7 @@ Document - DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [4] Basic.cshtml) @@ -43,12 +43,12 @@ Document - RazorIRToken - (83:2,34 [2] Basic.cshtml) - Html - \n RazorIRToken - (85:3,0 [6] Basic.cshtml) - Html - RazorIRToken - (91:3,6 [2] Basic.cshtml) - Html - \n - CSharpStatement - (95:4,2 [25] Basic.cshtml) + CSharpCode - (95:4,2 [25] Basic.cshtml) RazorIRToken - (95:4,2 [25] Basic.cshtml) - CSharp - \n var cls = "foo";\n HtmlContent - (123:7,0 [2] Basic.cshtml) RazorIRToken - (123:7,0 [2] Basic.cshtml) - Html -

- MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(0, 4, true); HtmlContent - (0:0,0 [4] Basic.cshtml) RazorIRToken - (0:0,0 [4] Basic.cshtml) - Html -

RazorIRToken - (30:0,30 [19] Basic.cshtml) - Html - \n Hello world\n RazorIRToken - (49:2,0 [4] Basic.cshtml) - Html - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(54, 29, false); CSharpExpression - (54:2,5 [29] Basic.cshtml) RazorIRToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello") - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(83, 10, true); HtmlContent - (83:2,34 [10] Basic.cshtml) RazorIRToken - (83:2,34 [2] Basic.cshtml) - Html - \n RazorIRToken - (85:3,0 [6] Basic.cshtml) - Html -
RazorIRToken - (91:3,6 [2] Basic.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - (95:4,2 [25] Basic.cshtml) + CSharpCode - (95:4,2 [25] Basic.cshtml) RazorIRToken - (95:4,2 [25] Basic.cshtml) - CSharp - \n var cls = "foo";\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(123, 2, true); HtmlContent - (123:7,0 [2] Basic.cshtml) RazorIRToken - (123:7,0 [2] Basic.cshtml) - Html -

RazorIRToken - (162:7,39 [2] Basic.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt index 9f2dbf41d1..e4c4f4b569 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt @@ -25,7 +25,7 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml) @@ -51,7 +51,7 @@ Document - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt index 52012b5e42..75ff2fdaa0 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt @@ -10,66 +10,66 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(83, 4, true); HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml) RazorIRToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(108, 5, true); HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml) RazorIRToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(119, 2, true); HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml) RazorIRToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(128, 4, true); HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml) RazorIRToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(139, 2, true); HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml) RazorIRToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(149, 2, true); HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml) RazorIRToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(176, 4, true); HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml) RazorIRToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(190, 2, true); HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml) RazorIRToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(203, 2, true); HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml) RazorIRToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt index 1d0a8e56fe..499c3c3f78 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (10:0,10 [26] InheritsViewModel.cshtml) - MyBasePageForViews DirectiveToken - (45:1,7 [7] InheritsViewModel.cshtml) - MyModel - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt index d7a4e474d8..ede17664ad 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt index 2de610a188..63cb219c2c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (14:1,7 [7] InheritsWithViewImports.cshtml) - MyModel - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - @@ -36,7 +36,7 @@ Document - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public MyModel Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt index 8534ada639..5ea399aa02 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System @@ -17,7 +17,7 @@ Document - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public MyModel Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt index bce1a8f5d7..dda654a0dc 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -31,7 +31,7 @@ Document - DirectiveToken - (30:1,14 [14] InjectWithModel.cshtml) - MyPropertyName DirectiveToken - (54:2,8 [17] InjectWithModel.cshtml) - MyService DirectiveToken - (72:2,26 [4] InjectWithModel.cshtml) - Html - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt index 79ff1ac510..f1a0fdb42f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt index d66fa3137a..93dadf0e57 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -35,7 +35,7 @@ Document - DirectiveToken - (99:3,14 [15] InjectWithSemicolon.cshtml) - MyPropertyName2 DirectiveToken - (129:4,8 [17] InjectWithSemicolon.cshtml) - MyService DirectiveToken - (147:4,26 [5] InjectWithSemicolon.cshtml) - Html2 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt index 28db262025..d388cbcc2c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt index 76e74a0d8a..ce29261f76 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (8:0,8 [5] Inject.cshtml) - MyApp DirectiveToken - (14:0,14 [14] Inject.cshtml) - MyPropertyName - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt index 3a51ebe8de..775ef78ac8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt index 6cf3ca93c9..c4505a2ce7 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt @@ -24,7 +24,7 @@ Document - DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt index 637caafd8d..ab6bff4c98 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt @@ -10,11 +10,11 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(11, 5, true); HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) RazorIRToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test. - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt index b5845a4d60..c2319fac43 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -26,7 +26,7 @@ Document - DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml) @@ -43,7 +43,7 @@ Document - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt index 07dd67f2ec..6ff604ceb2 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System @@ -12,7 +12,7 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(6, 49, true); HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml) RazorIRToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n @@ -23,14 +23,14 @@ Document - RazorIRToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html -

RazorIRToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome. RazorIRToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html -

- CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt index 01d9402350..d96efabba5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (7:0,7 [8] ModelExpressionTagHelper.cshtml) - DateTime DirectiveToken - (33:2,14 [29] ModelExpressionTagHelper.cshtml) - "InputTestTagHelper, AppCode" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - InputTestTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt index da13aea18a..2636f79e96 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System @@ -13,19 +13,19 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DeclareTagHelperFields - - InputTestTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(17, 2, true); HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml) RazorIRToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(64, 2, true); HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml) RazorIRToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(66, 25, false); TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing TagHelperBody - @@ -36,15 +36,15 @@ Document - RazorIRToken - - CSharp - __model. RazorIRToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date RazorIRToken - - CSharp - ) - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(91, 2, true); HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml) RazorIRToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(93, 27, false); TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing TagHelperBody - @@ -54,13 +54,13 @@ Document - RazorIRToken - - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => RazorIRToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model RazorIRToken - - CSharp - ) - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(120, 2, true); HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml) RazorIRToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt index 68527b3260..00d3b77e18 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -27,7 +27,7 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (7:0,7 [30] Model.cshtml) - System.Collections.IEnumerable - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt index 7f8561700d..9e5d97c36d 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt index 8c8a437fc3..99412cf800 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (7:0,7 [21] MultipleModels.cshtml) - ThisShouldBeGenerated DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt index e18da35cd5..997e9618af 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(Test.Namespace.PageWithNamespace_Page), null)] NamespaceDeclaration - - Test.Namespace UsingStatement - - TModel = global::System.Object @@ -27,7 +27,7 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (18:1,11 [14] PageWithNamespace.cshtml) - Test.Namespace - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml) @@ -40,7 +40,7 @@ Document - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public PageWithNamespace_Page Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt index dffd318528..b7338f74e1 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(Test.Namespace.PageWithNamespace_Page), null)] NamespaceDeclaration - - Test.Namespace UsingStatement - (1:0,1 [14] ) - System @@ -12,21 +12,21 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - PageWithNamespace_Page - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(34, 20, true); HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml) RazorIRToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html -

RazorIRToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There! RazorIRToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html -

RazorIRToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public PageWithNamespace_Page Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt index dd8d9ed6bb..5a95d9920a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (23:2,14 [12] RazorPagesWithoutModel.cshtml) - "*, AppCode" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - DivTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync @@ -123,14 +123,14 @@ Document - RazorIRToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n RazorIRToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - RazorIRToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - (95:5,12 [283] RazorPagesWithoutModel.cshtml) + CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml) RazorIRToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n public IActionResult OnPost(Customer customer)\n {\n Name = customer.Name;\n return Redirect("~/customers/inlinepagemodels/");\n }\n\n public string Name { get; set; }\n\n public class Customer\n {\n public string Name { get; set; }\n }\n InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt index 25aacc9a53..84c943d72d 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System @@ -18,19 +18,19 @@ Document - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - DivTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(7, 2, true); HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml) RazorIRToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(81, 2, true); HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml) RazorIRToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(381, 75, true); HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml) RazorIRToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n @@ -43,53 +43,53 @@ Document - RazorIRToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html - class="form-horizontal" RazorIRToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - > RazorIRToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(456, 31, false); TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(487, 6, true); HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml) RazorIRToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(493, 237, false); TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(517, 48, true); HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml) RazorIRToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n RazorIRToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - RazorIRToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(588, 130, false); TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(611, 101, true); HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml) RazorIRToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n @@ -102,43 +102,43 @@ Document - RazorIRToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - > RazorIRToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - RazorIRToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(718, 6, true); HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml) RazorIRToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(730, 6, true); HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml) RazorIRToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(736, 174, false); TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(760, 10, true); HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml) RazorIRToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(770, 128, false); TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(809, 83, true); HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml) RazorIRToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n @@ -149,38 +149,38 @@ Document - RazorIRToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save RazorIRToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - RazorIRToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(898, 6, true); HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml) RazorIRToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(910, 11, true); HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml) RazorIRToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n RazorIRToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - RazorIRToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - (95:5,12 [283] RazorPagesWithoutModel.cshtml) + CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml) RazorIRToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n public IActionResult OnPost(Customer customer)\n {\n Name = customer.Name;\n return Redirect("~/customers/inlinepagemodels/");\n }\n\n public string Name { get; set; }\n\n public class Customer\n {\n public string Name { get; set; }\n }\n InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt index eeb1685cb5..c3ad6decd2 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -29,7 +29,7 @@ Document - DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (16:2,7 [8] RazorPages.cshtml) - NewModel DirectiveToken - (40:3,14 [12] RazorPages.cshtml) - "*, AppCode" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - DivTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync @@ -124,14 +124,14 @@ Document - RazorIRToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n RazorIRToken - (1013:39,0 [7] RazorPages.cshtml) - Html - RazorIRToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n - CSharpStatement - (112:6,12 [360] RazorPages.cshtml) + CSharpCode - (112:6,12 [360] RazorPages.cshtml) RazorIRToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n public class NewModel : PageModel\n {\n public IActionResult OnPost(Customer customer)\n {\n Name = customer.Name;\n return Redirect("~/customers/inlinepagemodels/");\n }\n\n public string Name { get; set; }\n }\n\n public class Customer\n {\n public string Name { get; set; }\n }\n InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public NewModel Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt index c888dd6902..e3811ffc04 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml), null)] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System @@ -18,19 +18,19 @@ Document - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - DivTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(7, 2, true); HtmlContent - (7:1,0 [2] RazorPages.cshtml) RazorIRToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(98, 2, true); HtmlContent - (98:5,0 [2] RazorPages.cshtml) RazorIRToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(475, 76, true); HtmlContent - (475:23,0 [76] RazorPages.cshtml) RazorIRToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n @@ -43,53 +43,53 @@ Document - RazorIRToken - (519:25,19 [24] RazorPages.cshtml) - Html - class="form-horizontal" RazorIRToken - (543:25,43 [2] RazorPages.cshtml) - Html - > RazorIRToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(551, 31, false); TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(582, 6, true); HtmlContent - (582:26,35 [6] RazorPages.cshtml) RazorIRToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(588, 243, false); TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(612, 48, true); HtmlContent - (612:27,28 [48] RazorPages.cshtml) RazorIRToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n RazorIRToken - (622:28,8 [6] RazorPages.cshtml) - Html - RazorIRToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(689, 130, false); TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(712, 101, true); HtmlContent - (712:29,31 [101] RazorPages.cshtml) RazorIRToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n @@ -102,43 +102,43 @@ Document - RazorIRToken - (795:31,37 [1] RazorPages.cshtml) - Html - > RazorIRToken - (796:31,38 [7] RazorPages.cshtml) - Html - RazorIRToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(819, 6, true); HtmlContent - (819:32,14 [6] RazorPages.cshtml) RazorIRToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(831, 6, true); HtmlContent - (831:33,10 [6] RazorPages.cshtml) RazorIRToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(837, 174, false); TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(861, 10, true); HtmlContent - (861:34,28 [10] RazorPages.cshtml) RazorIRToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(871, 128, false); TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(910, 83, true); HtmlContent - (910:35,47 [83] RazorPages.cshtml) RazorIRToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n @@ -149,38 +149,38 @@ Document - RazorIRToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save RazorIRToken - (974:36,62 [9] RazorPages.cshtml) - Html - RazorIRToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(999, 6, true); HtmlContent - (999:37,14 [6] RazorPages.cshtml) RazorIRToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(1011, 11, true); HtmlContent - (1011:38,10 [11] RazorPages.cshtml) RazorIRToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n RazorIRToken - (1013:39,0 [7] RazorPages.cshtml) - Html - RazorIRToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - (112:6,12 [360] RazorPages.cshtml) + CSharpCode - (112:6,12 [360] RazorPages.cshtml) RazorIRToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n public class NewModel : PageModel\n {\n public IActionResult OnPost(Customer customer)\n {\n Name = customer.Name;\n return Redirect("~/customers/inlinepagemodels/");\n }\n\n public string Name { get; set; }\n }\n\n public class Customer\n {\n public string Name { get; set; }\n }\n InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - public NewModel Model => ViewData.Model; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt index 9db5cc0dba..795c501a87 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -27,13 +27,13 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (14:0,14 [12] ViewComponentTagHelper.cshtml) - "*, AppCode" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper - AllTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (26:0,26 [2] ViewComponentTagHelper.cshtml) RazorIRToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n - CSharpStatement - (30:1,2 [26] ViewComponentTagHelper.cshtml) + CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml) RazorIRToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n var foo = "Hello";\n HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml) RazorIRToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n @@ -52,5 +52,5 @@ Document - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]\npublic class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper\n{\n private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;\n public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)\n {\n _helper = helper;\n }\n [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]\n public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }\n public System.String firstName { get; set; }\n public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)\n {\n (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);\n var content = await _helper.InvokeAsync("Test", new { firstName });\n output.TagName = null;\n output.Content.SetHtmlContent(content);\n }\n}\n diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt index 264abd8a28..ab06359980 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System @@ -14,15 +14,15 @@ Document - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - bar - World - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper - AllTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (30:1,2 [26] ViewComponentTagHelper.cshtml) + CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml) RazorIRToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n var foo = "Hello";\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(59, 2, true); HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml) RazorIRToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(61, 50, false); TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag TagHelperBody - @@ -32,12 +32,12 @@ Document - CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml) RazorIRToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo SetPreallocatedTagHelperProperty - - __tagHelperAttribute_0 - bar - Bar - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - InjectDirective - InjectDirective - InjectDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]\npublic class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper\n{\n private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;\n public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)\n {\n _helper = helper;\n }\n [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]\n public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }\n public System.String firstName { get; set; }\n public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)\n {\n (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);\n var content = await _helper.InvokeAsync("Test", new { firstName });\n output.TagName = null;\n output.Content.SetHtmlContent(content);\n }\n}\n diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt index 470845b442..d7317850e5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(Test.Namespace.ViewWithNamespace_View))] NamespaceDeclaration - - Test.Namespace UsingStatement - - TModel = global::System.Object @@ -27,7 +27,7 @@ Document - DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (11:0,11 [14] ViewWithNamespace.cshtml) - Test.Namespace - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt index 1bd1544b75..91df75c730 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(Test.Namespace.ViewWithNamespace_View))] NamespaceDeclaration - - Test.Namespace UsingStatement - (1:0,1 [14] ) - System @@ -12,14 +12,14 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - ViewWithNamespace_View - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(27, 20, true); HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml) RazorIRToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html -

RazorIRToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There! RazorIRToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html -

RazorIRToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); InjectDirective - InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt index f9d3318d85..808dec7ce8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - - TModel = global::System.Object @@ -28,7 +28,7 @@ Document - DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor DirectiveToken - (8:0,8 [19] _ViewImports.cshtml) - IHtmlHelper DirectiveToken - (28:0,28 [5] _ViewImports.cshtml) - Model - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync InjectDirective - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt index 991873986c..e4de890f19 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt @@ -1,6 +1,6 @@ Document - Checksum - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml))] NamespaceDeclaration - - AspNetCore UsingStatement - (1:0,1 [14] ) - System diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt index cfd08b19dc..c35490cf08 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt @@ -7,7 +7,7 @@ Document - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - FormTagHelper - InputTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(31, 28, true); HtmlContent - (31:1,0 [28] BasicTest.cshtml) RazorIRToken - (31:1,0 [5] BasicTest.cshtml) - Html - RazorIRToken - (57:1,26 [2] BasicTest.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(61, 7, false); CSharpExpression - (61:2,2 [7] BasicTest.cshtml) RazorIRToken - (61:2,2 [7] BasicTest.cshtml) - CSharp - "Hello" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(69, 2, true); HtmlContent - (69:2,10 [2] BasicTest.cshtml) RazorIRToken - (69:2,10 [2] BasicTest.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(71, 87, false); TagHelper - (71:3,0 [87] BasicTest.cshtml) - form - TagMode.StartTagAndEndTag TagHelperBody - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(91, 6, true); HtmlContent - (91:3,20 [6] BasicTest.cshtml) RazorIRToken - (91:3,20 [6] BasicTest.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(97, 52, false); TagHelper - (97:4,4 [52] BasicTest.cshtml) - input - TagMode.SelfClosing TagHelperBody - @@ -50,46 +50,46 @@ Document - CSharpExpression - (122:4,29 [12] BasicTest.cshtml) RazorIRToken - (122:4,29 [12] BasicTest.cshtml) - CSharp - DateTime.Now AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(149, 2, true); HtmlContent - (149:4,56 [2] BasicTest.cshtml) RazorIRToken - (149:4,56 [2] BasicTest.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); CreateTagHelper - - FormTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(158, 31, true); HtmlContent - (158:5,7 [31] BasicTest.cshtml) RazorIRToken - (158:5,7 [4] BasicTest.cshtml) - Html - \n\n RazorIRToken - (162:7,0 [6] BasicTest.cshtml) - Html - RazorIRToken - (168:7,6 [21] BasicTest.cshtml) - Html - Here is some content - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(207, 9, true); HtmlContent - (207:7,45 [9] BasicTest.cshtml) RazorIRToken - (207:7,45 [7] BasicTest.cshtml) - Html - RazorIRToken - (214:7,52 [2] BasicTest.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(217, 29, false); CSharpExpression - (217:8,1 [29] BasicTest.cshtml) RazorIRToken - (217:8,1 [4] BasicTest.cshtml) - CSharp - Foo( Template - (222:8,6 [24] BasicTest.cshtml) - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - BeginContext(222, 24, true); HtmlContent - (222:8,6 [24] BasicTest.cshtml) RazorIRToken - (222:8,6 [6] BasicTest.cshtml) - Html - RazorIRToken - (228:8,12 [11] BasicTest.cshtml) - Html - Hello world RazorIRToken - (239:8,23 [7] BasicTest.cshtml) - Html - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); RazorIRToken - (246:8,30 [1] BasicTest.cshtml) - CSharp - ) - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - EndContext(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs index 0964c8b381..75207b4dc6 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions Assert.Equal(2, @class.Children.Count); // No class node created for a VCTH for (var i = 0; i < @class.Children.Count; i++) { - Assert.IsNotType(@class.Children[i]); + Assert.IsNotType(@class.Children[i]); } } @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var @class = FindClassNode(irDocument); Assert.Equal(3, @class.Children.Count); - var vcthClass = Assert.IsType(@class.Children[2]); + var vcthClass = Assert.IsType(@class.Children[2]); var tokenNode = vcthClass.Children[0] as RazorIRToken; Assert.Equal( @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")] @@ -167,7 +167,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. var @class = FindClassNode(irDocument); Assert.Equal(3, @class.Children.Count); - var vcthClass = Assert.IsType(@class.Children[2]); + var vcthClass = Assert.IsType(@class.Children[2]); var tokenNode = vcthClass.Children[0] as RazorIRToken; Assert.Equal( @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")] @@ -253,7 +253,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. var @class = FindClassNode(irDocument); Assert.Equal(3, @class.Children.Count); - var vcthClass = Assert.IsType(@class.Children[2]); + var vcthClass = Assert.IsType(@class.Children[2]); var tokenNode = vcthClass.Children[0] as RazorIRToken; Assert.Equal( @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")] diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs index 8d49153ac6..8259773a0e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs @@ -236,7 +236,7 @@ __o = i++; } [Fact] - public void WriteCSharpStatement_WhitespaceContent_DoesNothing() + public void WriteCSharpCode_WhitespaceContent_DoesNothing() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -246,7 +246,7 @@ __o = i++; Writer = new Legacy.CSharpCodeWriter(), }; - var node = new CSharpStatementIRNode(); + var node = new CSharpCodeIRNode(); RazorIRBuilder.Create(node) .Add(new RazorIRToken() { @@ -255,7 +255,7 @@ __o = i++; }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -263,7 +263,7 @@ __o = i++; } [Fact] - public void WriteCSharpStatement_WhitespaceContentWithSource_WritesContent() + public void WriteCSharpCode_WhitespaceContentWithSource_WritesContent() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -274,7 +274,7 @@ __o = i++; Options = RazorCodeGenerationOptions.CreateDefault(), }; - var node = new CSharpStatementIRNode() + var node = new CSharpCodeIRNode() { Source = new SourceSpan("test.cshtml", 0, 0, 0, 3), }; @@ -286,7 +286,7 @@ __o = i++; }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -298,7 +298,7 @@ __o = i++; } [Fact] - public void WriteCSharpStatement_SkipsLinePragma_WithoutSource() + public void WriteCSharpCode_SkipsLinePragma_WithoutSource() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -308,7 +308,7 @@ __o = i++; Writer = new Legacy.CSharpCodeWriter(), }; - var node = new CSharpStatementIRNode(); + var node = new CSharpCodeIRNode(); RazorIRBuilder.Create(node) .Add(new RazorIRToken() { @@ -317,7 +317,7 @@ __o = i++; }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -329,7 +329,7 @@ __o = i++; } [Fact] - public void WriteCSharpStatement_WritesLinePragma_WithSource() + public void WriteCSharpCode_WritesLinePragma_WithSource() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -340,7 +340,7 @@ __o = i++; Options = RazorCodeGenerationOptions.CreateDefault(), }; - var node = new CSharpStatementIRNode() + var node = new CSharpCodeIRNode() { Source = new SourceSpan("test.cshtml", 0, 0, 0, 13), }; @@ -352,7 +352,7 @@ __o = i++; }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -368,7 +368,7 @@ if (true) { } } [Fact] - public void WriteCSharpStatement_WritesPadding_WithSource() + public void WriteCSharpCode_WritesPadding_WithSource() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -379,7 +379,7 @@ if (true) { } Options = RazorCodeGenerationOptions.CreateDefault(), }; - var node = new CSharpStatementIRNode() + var node = new CSharpCodeIRNode() { Source = new SourceSpan("test.cshtml", 0, 0, 0, 17), }; @@ -391,7 +391,7 @@ if (true) { } }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -436,7 +436,7 @@ if (true) { } } [Fact] - public void WriteCSharpStatementAttributeValue_RendersCorrectly() + public void WriteCSharpCodeAttributeValue_RendersCorrectly() { var writer = new DesignTimeBasicWriter(); var context = GetCSharpRenderingContext(writer); @@ -446,10 +446,10 @@ if (true) { } var codeDocument = RazorCodeDocument.Create(sourceDocument); context.CodeDocument = codeDocument; var irDocument = Lower(codeDocument); - var node = irDocument.Children.OfType().Single().Children[1] as CSharpStatementAttributeValueIRNode; + var node = irDocument.Children.OfType().Single().Children[1] as CSharpCodeAttributeValueIRNode; // Act - writer.WriteCSharpStatementAttributeValue(context, node); + writer.WriteCSharpCodeAttributeValue(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -465,7 +465,7 @@ if (true) { } } [Fact] - public void WriteCSharpStatementAttributeValue_WithExpression_RendersCorrectly() + public void WriteCSharpCodeAttributeValue_WithExpression_RendersCorrectly() { var writer = new DesignTimeBasicWriter(); var context = GetCSharpRenderingContext(writer); @@ -475,10 +475,10 @@ if (true) { } var codeDocument = RazorCodeDocument.Create(sourceDocument); context.CodeDocument = codeDocument; var irDocument = Lower(codeDocument); - var node = irDocument.Children.OfType().Single().Children[1] as CSharpStatementAttributeValueIRNode; + var node = irDocument.Children.OfType().Single().Children[1] as CSharpCodeAttributeValueIRNode; // Act - writer.WriteCSharpStatementAttributeValue(context, node); + writer.WriteCSharpCodeAttributeValue(context, node); // Assert var csharp = context.Writer.Builder.ToString(); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs index e061f25e19..38c8a28bea 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs @@ -295,7 +295,7 @@ Test(i++); } [Fact] - public void WriteCSharpStatement_WhitespaceContent_DoesNothing() + public void WriteCSharpCode_WhitespaceContent_DoesNothing() { // Arrange var writer = new RuntimeBasicWriter(); @@ -305,7 +305,7 @@ Test(i++); Writer = new Legacy.CSharpCodeWriter(), }; - var node = new CSharpStatementIRNode(); + var node = new CSharpCodeIRNode(); RazorIRBuilder.Create(node) .Add(new RazorIRToken() { @@ -314,7 +314,7 @@ Test(i++); }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -322,7 +322,7 @@ Test(i++); } [Fact] - public void WriteCSharpStatement_SkipsLinePragma_WithoutSource() + public void WriteCSharpCode_SkipsLinePragma_WithoutSource() { // Arrange var writer = new RuntimeBasicWriter(); @@ -332,7 +332,7 @@ Test(i++); Writer = new Legacy.CSharpCodeWriter(), }; - var node = new CSharpStatementIRNode(); + var node = new CSharpCodeIRNode(); RazorIRBuilder.Create(node) .Add(new RazorIRToken() { @@ -341,7 +341,7 @@ Test(i++); }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -353,7 +353,7 @@ Test(i++); } [Fact] - public void WriteCSharpStatement_WritesLinePragma_WithSource() + public void WriteCSharpCode_WritesLinePragma_WithSource() { // Arrange var writer = new RuntimeBasicWriter(); @@ -364,7 +364,7 @@ Test(i++); Options = RazorCodeGenerationOptions.CreateDefault(), }; - var node = new CSharpStatementIRNode() + var node = new CSharpCodeIRNode() { Source = new SourceSpan("test.cshtml", 0, 0, 0, 13), }; @@ -376,7 +376,7 @@ Test(i++); }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -392,7 +392,7 @@ if (true) { } } [Fact] - public void WriteCSharpStatement_WritesPadding_WithSource() + public void WriteCSharpCode_WritesPadding_WithSource() { // Arrange var writer = new RuntimeBasicWriter(); @@ -403,7 +403,7 @@ if (true) { } Options = RazorCodeGenerationOptions.CreateDefault(), }; - var node = new CSharpStatementIRNode() + var node = new CSharpCodeIRNode() { Source = new SourceSpan("test.cshtml", 0, 0, 0, 17), }; @@ -415,7 +415,7 @@ if (true) { } }); // Act - writer.WriteCSharpStatement(context, node); + writer.WriteCSharpCode(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -571,7 +571,7 @@ WriteAttributeValue("" "", 27, false, 28, 6, false); } [Fact] - public void WriteCSharpStatementAttributeValue_BuffersResult() + public void WriteCSharpCodeAttributeValue_BuffersResult() { var writer = new RuntimeBasicWriter(); var context = GetCSharpRenderingContext(writer); @@ -581,10 +581,10 @@ WriteAttributeValue("" "", 27, false, 28, 6, false); var codeDocument = RazorCodeDocument.Create(sourceDocument); context.CodeDocument = codeDocument; var irDocument = Lower(codeDocument); - var node = irDocument.Children.OfType().Single().Children[1] as CSharpStatementAttributeValueIRNode; + var node = irDocument.Children.OfType().Single().Children[1] as CSharpCodeAttributeValueIRNode; // Act - writer.WriteCSharpStatementAttributeValue(context, node); + writer.WriteCSharpCodeAttributeValue(context, node); // Assert var csharp = context.Writer.Builder.ToString(); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/TagHelperHtmlAttributeRuntimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/TagHelperHtmlAttributeRuntimeBasicWriterTest.cs index b1588f8e3c..cf33a4d314 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/TagHelperHtmlAttributeRuntimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/TagHelperHtmlAttributeRuntimeBasicWriterTest.cs @@ -62,7 +62,7 @@ AddHtmlAttributeValue("" "", 27, false, 28, 6, false); } [Fact] - public void WriteCSharpStatementAttributeValue_BuffersResult() + public void WriteCSharpCodeAttributeValue_BuffersResult() { var writer = new TagHelperHtmlAttributeRuntimeBasicWriter(); var context = GetCSharpRenderingContext(writer); @@ -72,10 +72,10 @@ AddHtmlAttributeValue("" "", 27, false, 28, 6, false); var codeDocument = RazorCodeDocument.Create(sourceDocument); context.CodeDocument = codeDocument; var irDocument = Lower(codeDocument); - var node = irDocument.Children.OfType().Single().Children[1] as CSharpStatementAttributeValueIRNode; + var node = irDocument.Children.OfType().Single().Children[1] as CSharpCodeAttributeValueIRNode; // Act - writer.WriteCSharpStatementAttributeValue(context, node); + writer.WriteCSharpCodeAttributeValue(context, node); // Assert var csharp = context.Writer.Builder.ToString(); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultDirectiveIRPassTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultDirectiveIRPassTest.cs index f614dd19be..d6e70419a5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultDirectiveIRPassTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultDirectiveIRPassTest.cs @@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language var @class = @namespace.Children[0]; Children(@class, node => Assert.IsType(node), - node => CSharpStatement(" var value = true; ", node)); + node => CSharpCode(" var value = true; ", node)); var method = (MethodDeclarationIRNode)@class.Children[0]; Assert.Empty(method.Children); } @@ -96,9 +96,9 @@ namespace Microsoft.AspNetCore.Razor.Language var @class = @namespace.Children[0]; var method = SingleChild(@class); Children(method, - node => CSharpStatement("DefineSection(\"Header\", async () => {", node), + node => CSharpCode("DefineSection(\"Header\", async () => {", node), node => Html("

Hello World

", node), - node => CSharpStatement("});", node)); + node => CSharpCode("});", node)); } [Fact] @@ -129,9 +129,9 @@ namespace Microsoft.AspNetCore.Razor.Language var @class = @namespace.Children[0]; var method = SingleChild(@class); Children(method, - node => CSharpStatement("DefineSection(\"Header\", async (__razor_section_writer) => {", node), + node => CSharpCode("DefineSection(\"Header\", async (__razor_section_writer) => {", node), node => Html("

Hello World

", node), - node => CSharpStatement("});", node)); + node => CSharpCode("});", node)); } private static DocumentIRNode Lower(RazorCodeDocument codeDocument) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs index e2d5639a52..325db77678 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs @@ -167,7 +167,7 @@ namespace Microsoft.AspNetCore.Razor.Language n => Directive( "functions", n, - c => Assert.IsType(c))); + c => Assert.IsType(c))); } [Fact] diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs index 39951de8d8..951dd293a1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs @@ -206,7 +206,7 @@ namespace Microsoft.AspNetCore.Razor.Language var builder = RazorIRBuilder.Create(irDocument); builder.Add(new HtmlContentIRNode()); - builder.Add(new CSharpStatementIRNode()); + builder.Add(new CSharpCodeIRNode()); var pass = new TestDocumentClassifierPass(); pass.Engine = RazorEngine.CreateEmpty(b => { }); @@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Language Children( method, n => Assert.IsType(n), - n => Assert.IsType(n)); + n => Assert.IsType(n)); } [Fact] @@ -235,7 +235,7 @@ namespace Microsoft.AspNetCore.Razor.Language var builder = RazorIRBuilder.Create(irDocument); builder.Add(new HtmlContentIRNode()); - builder.Add(new CSharpStatementIRNode()); + builder.Add(new CSharpCodeIRNode()); var pass = new TestDocumentClassifierPass() { @@ -270,7 +270,7 @@ namespace Microsoft.AspNetCore.Razor.Language var builder = RazorIRBuilder.Create(irDocument); builder.Add(new HtmlContentIRNode()); - builder.Add(new CSharpStatementIRNode()); + builder.Add(new CSharpCodeIRNode()); var pass = new TestDocumentClassifierPass() { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs index 8f1624bbb0..6a53ed64b5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs @@ -361,6 +361,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors); } + [Fact] + public void DuplicateTargetTagHelper_Runtime() + { + // Arrange, Act & Assert + RunRuntimeTagHelpersTest(TestTagHelperDescriptors.DuplicateTargetTagHelperDescriptors); + } + [Fact] public void AttributeTargetingTagHelpers_Runtime() { @@ -795,6 +802,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DefaultPAndInputTagHelperDescriptors); } + [Fact] + public void DuplicateTargetTagHelper_DesignTime() + { + // Arrange, Act & Assert + RunDesignTimeTagHelpersTest(TestTagHelperDescriptors.DuplicateTargetTagHelperDescriptors); + } + [Fact] public void AttributeTargetingTagHelpers_DesignTime() { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TestTagHelperDescriptors.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TestTagHelperDescriptors.cs index 94a891ac10..14ae56a1af 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TestTagHelperDescriptors.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TestTagHelperDescriptors.cs @@ -292,6 +292,46 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests } } + public static IEnumerable DuplicateTargetTagHelperDescriptors + { + get + { + var typePropertyInfo = typeof(TestType).GetRuntimeProperty("Type"); + var checkedPropertyInfo = typeof(TestType).GetRuntimeProperty("Checked"); + return new[] + { + CreateTagHelperDescriptor( + tagName: "*", + typeName: "TestNamespace.CatchAllTagHelper", + assemblyName: "TestAssembly", + attributes: new Action[] + { + builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", typePropertyInfo), + builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "checked", checkedPropertyInfo), + }, + ruleBuilders: new Action[] + { + builder => builder.RequireAttribute(attribute => attribute.Name("type")), + builder => builder.RequireAttribute(attribute => attribute.Name("checked")) + }), + CreateTagHelperDescriptor( + tagName: "input", + typeName: "TestNamespace.InputTagHelper", + assemblyName: "TestAssembly", + attributes: new Action[] + { + builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "type", typePropertyInfo), + builder => BuildBoundAttributeDescriptorFromPropertyInfo(builder, "checked", checkedPropertyInfo), + }, + ruleBuilders: new Action[] + { + builder => builder.RequireAttribute(attribute => attribute.Name("type")), + builder => builder.RequireAttribute(attribute => attribute.Name("checked")) + }) + }; + } + } + public static IEnumerable AttributeTargetingTagHelperDescriptors { get diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt index de4c10bc90..a5f95fbc6c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AddTagHelperDirective_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] AddTagHelperDirective.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:0,31 [2] AddTagHelperDirective.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt index e0126c6de6..3ecb34082f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] AttributeTargetingTagHelpers.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.CatchAllTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt index 7f44e760ec..6431d8dff7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (89:5,1 [102] Await.cshtml) @@ -30,14 +30,14 @@ Document - RazorIRToken - (263:10,54 [6] Await.cshtml) - Html - \n RazorIRToken - (269:11,4 [3] Await.cshtml) - Html -

RazorIRToken - (272:11,7 [30] Await.cshtml) - Html - Basic Asynchronous Statement: - CSharpStatement - (304:11,39 [14] Await.cshtml) + CSharpCode - (304:11,39 [14] Await.cshtml) RazorIRToken - (304:11,39 [14] Await.cshtml) - CSharp - await Foo(); HtmlContent - (319:11,54 [50] Await.cshtml) RazorIRToken - (319:11,54 [4] Await.cshtml) - Html -

RazorIRToken - (323:11,58 [6] Await.cshtml) - Html - \n RazorIRToken - (329:12,4 [3] Await.cshtml) - Html -

RazorIRToken - (332:12,7 [37] Await.cshtml) - Html - Basic Asynchronous Statement Nested: - CSharpStatement - (371:12,46 [1] Await.cshtml) + CSharpCode - (371:12,46 [1] Await.cshtml) RazorIRToken - (371:12,46 [1] Await.cshtml) - CSharp - HtmlContent - (372:12,47 [3] Await.cshtml) RazorIRToken - (372:12,47 [3] Await.cshtml) - Html - @@ -45,7 +45,7 @@ Document - RazorIRToken - (376:12,51 [11] Await.cshtml) - CSharp - await Foo() HtmlContent - (387:12,62 [4] Await.cshtml) RazorIRToken - (387:12,62 [4] Await.cshtml) - Html - - CSharpStatement - (391:12,66 [1] Await.cshtml) + CSharpCode - (391:12,66 [1] Await.cshtml) RazorIRToken - (391:12,66 [1] Await.cshtml) - CSharp - HtmlContent - (393:12,68 [54] Await.cshtml) RazorIRToken - (393:12,68 [4] Await.cshtml) - Html -

@@ -88,21 +88,21 @@ Document - RazorIRToken - (743:20,68 [6] Await.cshtml) - Html - \n RazorIRToken - (749:21,4 [3] Await.cshtml) - Html -

RazorIRToken - (752:21,7 [33] Await.cshtml) - Html - Advanced Asynchronous Statement: - CSharpStatement - (787:21,42 [39] Await.cshtml) + CSharpCode - (787:21,42 [39] Await.cshtml) RazorIRToken - (787:21,42 [39] Await.cshtml) - CSharp - await Foo(something, hello: "world"); HtmlContent - (827:21,82 [55] Await.cshtml) RazorIRToken - (827:21,82 [4] Await.cshtml) - Html -

RazorIRToken - (831:21,86 [6] Await.cshtml) - Html - \n RazorIRToken - (837:22,4 [3] Await.cshtml) - Html -

RazorIRToken - (840:22,7 [42] Await.cshtml) - Html - Advanced Asynchronous Statement Extended: - CSharpStatement - (884:22,51 [21] Await.cshtml) + CSharpCode - (884:22,51 [21] Await.cshtml) RazorIRToken - (884:22,51 [21] Await.cshtml) - CSharp - await Foo.Bar(1, 2) HtmlContent - (906:22,73 [53] Await.cshtml) RazorIRToken - (906:22,73 [4] Await.cshtml) - Html -

RazorIRToken - (910:22,77 [6] Await.cshtml) - Html - \n RazorIRToken - (916:23,4 [3] Await.cshtml) - Html -

RazorIRToken - (919:23,7 [40] Await.cshtml) - Html - Advanced Asynchronous Statement Nested: - CSharpStatement - (961:23,49 [1] Await.cshtml) + CSharpCode - (961:23,49 [1] Await.cshtml) RazorIRToken - (961:23,49 [1] Await.cshtml) - CSharp - HtmlContent - (962:23,50 [3] Await.cshtml) RazorIRToken - (962:23,50 [3] Await.cshtml) - Html - @@ -110,7 +110,7 @@ Document - RazorIRToken - (966:23,54 [27] Await.cshtml) - CSharp - await Foo(boolValue: false) HtmlContent - (993:23,81 [4] Await.cshtml) RazorIRToken - (993:23,81 [4] Await.cshtml) - Html - - CSharpStatement - (997:23,85 [1] Await.cshtml) + CSharpCode - (997:23,85 [1] Await.cshtml) RazorIRToken - (997:23,85 [1] Await.cshtml) - CSharp - HtmlContent - (999:23,87 [57] Await.cshtml) RazorIRToken - (999:23,87 [4] Await.cshtml) - Html -

@@ -123,5 +123,5 @@ Document - RazorIRToken - (1076:24,71 [4] Await.cshtml) - Html -

RazorIRToken - (1080:24,75 [2] Await.cshtml) - Html - \n RazorIRToken - (1082:25,0 [10] Await.cshtml) - Html - - CSharpStatement - (12:0,12 [76] Await.cshtml) + CSharpCode - (12:0,12 [76] Await.cshtml) RazorIRToken - (12:0,12 [76] Await.cshtml) - CSharp - \n public async Task Foo()\n {\n return "Bar";\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt index 1233ab6016..466c5b5794 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt @@ -27,7 +27,7 @@ Document - RazorIRToken - (263:10,54 [6] Await.cshtml) - Html - \n RazorIRToken - (269:11,4 [3] Await.cshtml) - Html -

RazorIRToken - (272:11,7 [30] Await.cshtml) - Html - Basic Asynchronous Statement: - CSharpStatement - (304:11,39 [14] Await.cshtml) + CSharpCode - (304:11,39 [14] Await.cshtml) RazorIRToken - (304:11,39 [14] Await.cshtml) - CSharp - await Foo(); HtmlContent - (319:11,54 [50] Await.cshtml) RazorIRToken - (319:11,54 [4] Await.cshtml) - Html -

@@ -42,7 +42,7 @@ Document - HtmlContent - (387:12,62 [5] Await.cshtml) RazorIRToken - (387:12,62 [4] Await.cshtml) - Html - RazorIRToken - (391:12,66 [1] Await.cshtml) - Html - - CSharpStatement - (392:12,67 [0] Await.cshtml) + CSharpCode - (392:12,67 [0] Await.cshtml) RazorIRToken - (392:12,67 [0] Await.cshtml) - CSharp - HtmlContent - (393:12,68 [54] Await.cshtml) RazorIRToken - (393:12,68 [4] Await.cshtml) - Html -

@@ -85,14 +85,14 @@ Document - RazorIRToken - (743:20,68 [6] Await.cshtml) - Html - \n RazorIRToken - (749:21,4 [3] Await.cshtml) - Html -

RazorIRToken - (752:21,7 [33] Await.cshtml) - Html - Advanced Asynchronous Statement: - CSharpStatement - (787:21,42 [39] Await.cshtml) + CSharpCode - (787:21,42 [39] Await.cshtml) RazorIRToken - (787:21,42 [39] Await.cshtml) - CSharp - await Foo(something, hello: "world"); HtmlContent - (827:21,82 [55] Await.cshtml) RazorIRToken - (827:21,82 [4] Await.cshtml) - Html -

RazorIRToken - (831:21,86 [6] Await.cshtml) - Html - \n RazorIRToken - (837:22,4 [3] Await.cshtml) - Html -

RazorIRToken - (840:22,7 [42] Await.cshtml) - Html - Advanced Asynchronous Statement Extended: - CSharpStatement - (884:22,51 [21] Await.cshtml) + CSharpCode - (884:22,51 [21] Await.cshtml) RazorIRToken - (884:22,51 [21] Await.cshtml) - CSharp - await Foo.Bar(1, 2) HtmlContent - (906:22,73 [53] Await.cshtml) RazorIRToken - (906:22,73 [4] Await.cshtml) - Html -

@@ -107,7 +107,7 @@ Document - HtmlContent - (993:23,81 [5] Await.cshtml) RazorIRToken - (993:23,81 [4] Await.cshtml) - Html - RazorIRToken - (997:23,85 [1] Await.cshtml) - Html - - CSharpStatement - (998:23,86 [0] Await.cshtml) + CSharpCode - (998:23,86 [0] Await.cshtml) RazorIRToken - (998:23,86 [0] Await.cshtml) - CSharp - HtmlContent - (999:23,87 [57] Await.cshtml) RazorIRToken - (999:23,87 [4] Await.cshtml) - Html -

@@ -120,5 +120,5 @@ Document - RazorIRToken - (1076:24,71 [4] Await.cshtml) - Html -

RazorIRToken - (1080:24,75 [2] Await.cshtml) - Html - \n RazorIRToken - (1082:25,0 [10] Await.cshtml) - Html - - CSharpStatement - (12:0,12 [76] Await.cshtml) + CSharpCode - (12:0,12 [76] Await.cshtml) RazorIRToken - (12:0,12 [76] Await.cshtml) - CSharp - \n public async Task Foo()\n {\n return "Bar";\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt index 187428aa2d..85f808fec4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt @@ -7,7 +7,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicImports_DesignTime - Hello - DesignTimeDirective - DirectiveToken - (119:4,10 [5] BasicImports_Imports0.cshtml) - Hello - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] BasicImports.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt index ca673fbb7b..dcdeb7a053 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] BasicTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt index 466e333154..ba6e6ce787 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt @@ -5,7 +5,7 @@ Document - DesignTimeDirective - DirectiveToken - (17:0,17 [5] BasicTagHelpers_Prefixed.cshtml) - "THS" DirectiveToken - (38:1,14 [17] BasicTagHelpers_Prefixed.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt index 956a3c02c1..1ef2aae483 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt @@ -3,14 +3,14 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [18] Blocks.cshtml) + CSharpCode - (2:0,2 [18] Blocks.cshtml) RazorIRToken - (2:0,2 [18] Blocks.cshtml) - CSharp - \n int i = 1;\n HtmlContent - (23:3,0 [2] Blocks.cshtml) RazorIRToken - (23:3,0 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (26:4,1 [22] Blocks.cshtml) + CSharpCode - (26:4,1 [22] Blocks.cshtml) RazorIRToken - (26:4,1 [22] Blocks.cshtml) - CSharp - while(i <= 10) {\n HtmlContent - (48:5,4 [19] Blocks.cshtml) RazorIRToken - (48:5,4 [3] Blocks.cshtml) - Html -

@@ -19,37 +19,37 @@ Document - RazorIRToken - (69:5,25 [1] Blocks.cshtml) - CSharp - i HtmlContent - (71:5,27 [4] Blocks.cshtml) RazorIRToken - (71:5,27 [4] Blocks.cshtml) - Html -

- CSharpStatement - (75:5,31 [16] Blocks.cshtml) + CSharpCode - (75:5,31 [16] Blocks.cshtml) RazorIRToken - (75:5,31 [16] Blocks.cshtml) - CSharp - \n i += 1;\n} HtmlContent - (91:7,1 [4] Blocks.cshtml) RazorIRToken - (91:7,1 [4] Blocks.cshtml) - Html - \n\n - CSharpStatement - (96:9,1 [19] Blocks.cshtml) + CSharpCode - (96:9,1 [19] Blocks.cshtml) RazorIRToken - (96:9,1 [19] Blocks.cshtml) - CSharp - if(i == 11) {\n HtmlContent - (115:10,4 [25] Blocks.cshtml) RazorIRToken - (115:10,4 [3] Blocks.cshtml) - Html -

RazorIRToken - (118:10,7 [18] Blocks.cshtml) - Html - We wrote 10 lines! RazorIRToken - (136:10,25 [4] Blocks.cshtml) - Html -

- CSharpStatement - (140:10,29 [3] Blocks.cshtml) + CSharpCode - (140:10,29 [3] Blocks.cshtml) RazorIRToken - (140:10,29 [3] Blocks.cshtml) - CSharp - \n} HtmlContent - (143:11,1 [4] Blocks.cshtml) RazorIRToken - (143:11,1 [4] Blocks.cshtml) - Html - \n\n - CSharpStatement - (148:13,1 [35] Blocks.cshtml) + CSharpCode - (148:13,1 [35] Blocks.cshtml) RazorIRToken - (148:13,1 [35] Blocks.cshtml) - CSharp - switch(i) {\n case 11:\n HtmlContent - (183:15,8 [36] Blocks.cshtml) RazorIRToken - (183:15,8 [3] Blocks.cshtml) - Html -

RazorIRToken - (186:15,11 [29] Blocks.cshtml) - Html - No really, we wrote 10 lines! RazorIRToken - (215:15,40 [4] Blocks.cshtml) - Html -

- CSharpStatement - (219:15,44 [40] Blocks.cshtml) + CSharpCode - (219:15,44 [40] Blocks.cshtml) RazorIRToken - (219:15,44 [40] Blocks.cshtml) - CSharp - \n break;\n default:\n HtmlContent - (259:18,8 [29] Blocks.cshtml) RazorIRToken - (259:18,8 [3] Blocks.cshtml) - Html -

RazorIRToken - (262:18,11 [22] Blocks.cshtml) - Html - Actually, we didn't... RazorIRToken - (284:18,33 [4] Blocks.cshtml) - Html -

- CSharpStatement - (288:18,37 [19] Blocks.cshtml) + CSharpCode - (288:18,37 [19] Blocks.cshtml) RazorIRToken - (288:18,37 [19] Blocks.cshtml) - CSharp - \n break;\n} HtmlContent - (307:20,1 [4] Blocks.cshtml) RazorIRToken - (307:20,1 [4] Blocks.cshtml) - Html - \n\n - CSharpStatement - (312:22,1 [39] Blocks.cshtml) + CSharpCode - (312:22,1 [39] Blocks.cshtml) RazorIRToken - (312:22,1 [39] Blocks.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n HtmlContent - (351:23,4 [25] Blocks.cshtml) RazorIRToken - (351:23,4 [3] Blocks.cshtml) - Html -

@@ -58,17 +58,17 @@ Document - RazorIRToken - (378:23,31 [1] Blocks.cshtml) - CSharp - j HtmlContent - (380:23,33 [4] Blocks.cshtml) RazorIRToken - (380:23,33 [4] Blocks.cshtml) - Html -

- CSharpStatement - (384:23,37 [3] Blocks.cshtml) + CSharpCode - (384:23,37 [3] Blocks.cshtml) RazorIRToken - (384:23,37 [3] Blocks.cshtml) - CSharp - \n} HtmlContent - (387:24,1 [4] Blocks.cshtml) RazorIRToken - (387:24,1 [4] Blocks.cshtml) - Html - \n\n - CSharpStatement - (392:26,1 [11] Blocks.cshtml) + CSharpCode - (392:26,1 [11] Blocks.cshtml) RazorIRToken - (392:26,1 [11] Blocks.cshtml) - CSharp - try {\n HtmlContent - (403:27,4 [35] Blocks.cshtml) RazorIRToken - (403:27,4 [3] Blocks.cshtml) - Html -

RazorIRToken - (406:27,7 [28] Blocks.cshtml) - Html - That time, we wrote 5 lines! RazorIRToken - (434:27,35 [4] Blocks.cshtml) - Html -

- CSharpStatement - (438:27,39 [31] Blocks.cshtml) + CSharpCode - (438:27,39 [31] Blocks.cshtml) RazorIRToken - (438:27,39 [31] Blocks.cshtml) - CSharp - \n} catch(Exception ex) {\n HtmlContent - (469:29,4 [29] Blocks.cshtml) RazorIRToken - (469:29,4 [3] Blocks.cshtml) - Html -

@@ -77,7 +77,7 @@ Document - RazorIRToken - (500:29,35 [10] Blocks.cshtml) - CSharp - ex.Message HtmlContent - (511:29,46 [4] Blocks.cshtml) RazorIRToken - (511:29,46 [4] Blocks.cshtml) - Html -

- CSharpStatement - (515:29,50 [3] Blocks.cshtml) + CSharpCode - (515:29,50 [3] Blocks.cshtml) RazorIRToken - (515:29,50 [3] Blocks.cshtml) - CSharp - \n} HtmlContent - (518:30,1 [16] Blocks.cshtml) RazorIRToken - (518:30,1 [4] Blocks.cshtml) - Html - \n\n @@ -88,11 +88,11 @@ Document - HtmlContent - (536:32,14 [8] Blocks.cshtml) RazorIRToken - (536:32,14 [4] Blocks.cshtml) - Html -

RazorIRToken - (540:32,18 [4] Blocks.cshtml) - Html - \n\n - CSharpStatement - (545:34,1 [26] Blocks.cshtml) + CSharpCode - (545:34,1 [26] Blocks.cshtml) RazorIRToken - (545:34,1 [26] Blocks.cshtml) - CSharp - lock(new object()) {\n HtmlContent - (571:35,4 [47] Blocks.cshtml) RazorIRToken - (571:35,4 [3] Blocks.cshtml) - Html -

RazorIRToken - (574:35,7 [40] Blocks.cshtml) - Html - This block is locked, for your security! RazorIRToken - (614:35,47 [4] Blocks.cshtml) - Html -

- CSharpStatement - (618:35,51 [3] Blocks.cshtml) + CSharpCode - (618:35,51 [3] Blocks.cshtml) RazorIRToken - (618:35,51 [3] Blocks.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt index 4d755c3958..b6c251a42e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt @@ -3,11 +3,11 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [18] Blocks.cshtml) + CSharpCode - (2:0,2 [18] Blocks.cshtml) RazorIRToken - (2:0,2 [18] Blocks.cshtml) - CSharp - \n int i = 1;\n HtmlContent - (23:3,0 [2] Blocks.cshtml) RazorIRToken - (23:3,0 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (26:4,1 [18] Blocks.cshtml) + CSharpCode - (26:4,1 [18] Blocks.cshtml) RazorIRToken - (26:4,1 [18] Blocks.cshtml) - CSharp - while(i <= 10) {\n HtmlContent - (44:5,0 [23] Blocks.cshtml) RazorIRToken - (44:5,0 [4] Blocks.cshtml) - Html - @@ -18,11 +18,11 @@ Document - HtmlContent - (71:5,27 [6] Blocks.cshtml) RazorIRToken - (71:5,27 [4] Blocks.cshtml) - Html -

RazorIRToken - (75:5,31 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (77:6,0 [16] Blocks.cshtml) + CSharpCode - (77:6,0 [16] Blocks.cshtml) RazorIRToken - (77:6,0 [16] Blocks.cshtml) - CSharp - i += 1;\n}\n HtmlContent - (93:8,0 [2] Blocks.cshtml) RazorIRToken - (93:8,0 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (96:9,1 [15] Blocks.cshtml) + CSharpCode - (96:9,1 [15] Blocks.cshtml) RazorIRToken - (96:9,1 [15] Blocks.cshtml) - CSharp - if(i == 11) {\n HtmlContent - (111:10,0 [31] Blocks.cshtml) RazorIRToken - (111:10,0 [4] Blocks.cshtml) - Html - @@ -30,11 +30,11 @@ Document - RazorIRToken - (118:10,7 [18] Blocks.cshtml) - Html - We wrote 10 lines! RazorIRToken - (136:10,25 [4] Blocks.cshtml) - Html -

RazorIRToken - (140:10,29 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (142:11,0 [3] Blocks.cshtml) + CSharpCode - (142:11,0 [3] Blocks.cshtml) RazorIRToken - (142:11,0 [3] Blocks.cshtml) - CSharp - }\n HtmlContent - (145:12,0 [2] Blocks.cshtml) RazorIRToken - (145:12,0 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (148:13,1 [27] Blocks.cshtml) + CSharpCode - (148:13,1 [27] Blocks.cshtml) RazorIRToken - (148:13,1 [27] Blocks.cshtml) - CSharp - switch(i) {\n case 11:\n HtmlContent - (175:15,0 [46] Blocks.cshtml) RazorIRToken - (175:15,0 [8] Blocks.cshtml) - Html - @@ -42,7 +42,7 @@ Document - RazorIRToken - (186:15,11 [29] Blocks.cshtml) - Html - No really, we wrote 10 lines! RazorIRToken - (215:15,40 [4] Blocks.cshtml) - Html -

RazorIRToken - (219:15,44 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (221:16,0 [30] Blocks.cshtml) + CSharpCode - (221:16,0 [30] Blocks.cshtml) RazorIRToken - (221:16,0 [30] Blocks.cshtml) - CSharp - break;\n default:\n HtmlContent - (251:18,0 [39] Blocks.cshtml) RazorIRToken - (251:18,0 [8] Blocks.cshtml) - Html - @@ -50,11 +50,11 @@ Document - RazorIRToken - (262:18,11 [22] Blocks.cshtml) - Html - Actually, we didn't... RazorIRToken - (284:18,33 [4] Blocks.cshtml) - Html -

RazorIRToken - (288:18,37 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (290:19,0 [19] Blocks.cshtml) + CSharpCode - (290:19,0 [19] Blocks.cshtml) RazorIRToken - (290:19,0 [19] Blocks.cshtml) - CSharp - break;\n}\n HtmlContent - (309:21,0 [2] Blocks.cshtml) RazorIRToken - (309:21,0 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (312:22,1 [35] Blocks.cshtml) + CSharpCode - (312:22,1 [35] Blocks.cshtml) RazorIRToken - (312:22,1 [35] Blocks.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n HtmlContent - (347:23,0 [29] Blocks.cshtml) RazorIRToken - (347:23,0 [4] Blocks.cshtml) - Html - @@ -65,11 +65,11 @@ Document - HtmlContent - (380:23,33 [6] Blocks.cshtml) RazorIRToken - (380:23,33 [4] Blocks.cshtml) - Html -

RazorIRToken - (384:23,37 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (386:24,0 [3] Blocks.cshtml) + CSharpCode - (386:24,0 [3] Blocks.cshtml) RazorIRToken - (386:24,0 [3] Blocks.cshtml) - CSharp - }\n HtmlContent - (389:25,0 [2] Blocks.cshtml) RazorIRToken - (389:25,0 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (392:26,1 [7] Blocks.cshtml) + CSharpCode - (392:26,1 [7] Blocks.cshtml) RazorIRToken - (392:26,1 [7] Blocks.cshtml) - CSharp - try {\n HtmlContent - (399:27,0 [41] Blocks.cshtml) RazorIRToken - (399:27,0 [4] Blocks.cshtml) - Html - @@ -77,7 +77,7 @@ Document - RazorIRToken - (406:27,7 [28] Blocks.cshtml) - Html - That time, we wrote 5 lines! RazorIRToken - (434:27,35 [4] Blocks.cshtml) - Html -

RazorIRToken - (438:27,39 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (440:28,0 [25] Blocks.cshtml) + CSharpCode - (440:28,0 [25] Blocks.cshtml) RazorIRToken - (440:28,0 [25] Blocks.cshtml) - CSharp - } catch(Exception ex) {\n HtmlContent - (465:29,0 [33] Blocks.cshtml) RazorIRToken - (465:29,0 [4] Blocks.cshtml) - Html - @@ -88,7 +88,7 @@ Document - HtmlContent - (511:29,46 [6] Blocks.cshtml) RazorIRToken - (511:29,46 [4] Blocks.cshtml) - Html -

RazorIRToken - (515:29,50 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (517:30,0 [3] Blocks.cshtml) + CSharpCode - (517:30,0 [3] Blocks.cshtml) RazorIRToken - (517:30,0 [3] Blocks.cshtml) - CSharp - }\n HtmlContent - (520:31,0 [14] Blocks.cshtml) RazorIRToken - (520:31,0 [2] Blocks.cshtml) - Html - \n @@ -99,7 +99,7 @@ Document - HtmlContent - (536:32,14 [8] Blocks.cshtml) RazorIRToken - (536:32,14 [4] Blocks.cshtml) - Html -

RazorIRToken - (540:32,18 [4] Blocks.cshtml) - Html - \n\n - CSharpStatement - (545:34,1 [22] Blocks.cshtml) + CSharpCode - (545:34,1 [22] Blocks.cshtml) RazorIRToken - (545:34,1 [22] Blocks.cshtml) - CSharp - lock(new object()) {\n HtmlContent - (567:35,0 [53] Blocks.cshtml) RazorIRToken - (567:35,0 [4] Blocks.cshtml) - Html - @@ -107,5 +107,5 @@ Document - RazorIRToken - (574:35,7 [40] Blocks.cshtml) - Html - This block is locked, for your security! RazorIRToken - (614:35,47 [4] Blocks.cshtml) - Html -

RazorIRToken - (618:35,51 [2] Blocks.cshtml) - Html - \n - CSharpStatement - (620:36,0 [1] Blocks.cshtml) + CSharpCode - (620:36,0 [1] Blocks.cshtml) RazorIRToken - (620:36,0 [1] Blocks.cshtml) - CSharp - } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt index dfd56803ac..9c401894c3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.ir.txt @@ -3,19 +3,19 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CSharp7_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [12] CSharp7.cshtml) RazorIRToken - (0:0,0 [6] CSharp7.cshtml) - Html - RazorIRToken - (6:0,6 [6] CSharp7.cshtml) - Html - \n - CSharpStatement - (14:1,6 [187] CSharp7.cshtml) + CSharpCode - (14:1,6 [187] CSharp7.cshtml) RazorIRToken - (14:1,6 [187] CSharp7.cshtml) - CSharp - \n var nameLookup = new Dictionary()\n {\n ["John Doe"] = ("John", "Doe", true)\n };\n\n - CSharpStatement - (246:7,53 [253] CSharp7.cshtml) + CSharpCode - (246:7,53 [253] CSharp7.cshtml) RazorIRToken - (246:7,53 [253] CSharp7.cshtml) - CSharp - \n\n int Sixteen = 0b0001_0000;\n long BillionsAndBillions = 100_000_000_000;\n double AvogadroConstant = 6.022_140_857_747_474e23;\n decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;\n HtmlContent - (502:14,0 [6] CSharp7.cshtml) RazorIRToken - (502:14,0 [6] CSharp7.cshtml) - Html - \n - CSharpStatement - (509:15,5 [159] CSharp7.cshtml) + CSharpCode - (509:15,5 [159] CSharp7.cshtml) RazorIRToken - (509:15,5 [159] CSharp7.cshtml) - CSharp - if (nameLookup.TryGetValue("John Doe", out var entry))\n {\n if (entry.Extra is bool alive)\n {\n // Do Something\n }\n } HtmlContent - (668:21,5 [48] CSharp7.cshtml) RazorIRToken - (668:21,5 [6] CSharp7.cshtml) - Html - \n @@ -35,7 +35,7 @@ Document - RazorIRToken - (872:28,0 [4] CSharp7.cshtml) - Html - RazorIRToken - (876:28,4 [6] CSharp7.cshtml) - Html - RazorIRToken - (882:28,10 [8] CSharp7.cshtml) - Html - \n\n - CSharpStatement - (891:30,5 [291] CSharp7.cshtml) + CSharpCode - (891:30,5 [291] CSharp7.cshtml) RazorIRToken - (891:30,5 [291] CSharp7.cshtml) - CSharp - switch (entry.Extra)\n {\n case int age:\n // Do something\n break;\n case IEnumerable childrenNames:\n // Do more something\n break;\n case null:\n // Do even more of something\n break;\n } HtmlContent - (1182:41,5 [9] CSharp7.cshtml) RazorIRToken - (1182:41,5 [2] CSharp7.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt index 2a167d084c..6249f7338d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_Runtime.ir.txt @@ -6,17 +6,17 @@ Document - HtmlContent - (0:0,0 [8] CSharp7.cshtml) RazorIRToken - (0:0,0 [6] CSharp7.cshtml) - Html - RazorIRToken - (6:0,6 [2] CSharp7.cshtml) - Html - \n - CSharpStatement - (8:1,0 [4] CSharp7.cshtml) + CSharpCode - (8:1,0 [4] CSharp7.cshtml) RazorIRToken - (8:1,0 [4] CSharp7.cshtml) - CSharp - - CSharpStatement - (14:1,6 [187] CSharp7.cshtml) + CSharpCode - (14:1,6 [187] CSharp7.cshtml) RazorIRToken - (14:1,6 [187] CSharp7.cshtml) - CSharp - \n var nameLookup = new Dictionary()\n {\n ["John Doe"] = ("John", "Doe", true)\n };\n\n - CSharpStatement - (246:7,53 [253] CSharp7.cshtml) + CSharpCode - (246:7,53 [253] CSharp7.cshtml) RazorIRToken - (246:7,53 [253] CSharp7.cshtml) - CSharp - \n\n int Sixteen = 0b0001_0000;\n long BillionsAndBillions = 100_000_000_000;\n double AvogadroConstant = 6.022_140_857_747_474e23;\n decimal GoldenRatio = 1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M;\n HtmlContent - (502:14,0 [2] CSharp7.cshtml) RazorIRToken - (502:14,0 [2] CSharp7.cshtml) - Html - \n - CSharpStatement - (504:15,0 [4] CSharp7.cshtml) + CSharpCode - (504:15,0 [4] CSharp7.cshtml) RazorIRToken - (504:15,0 [4] CSharp7.cshtml) - CSharp - - CSharpStatement - (509:15,5 [161] CSharp7.cshtml) + CSharpCode - (509:15,5 [161] CSharp7.cshtml) RazorIRToken - (509:15,5 [161] CSharp7.cshtml) - CSharp - if (nameLookup.TryGetValue("John Doe", out var entry))\n {\n if (entry.Extra is bool alive)\n {\n // Do Something\n }\n }\n HtmlContent - (670:22,0 [46] CSharp7.cshtml) RazorIRToken - (670:22,0 [4] CSharp7.cshtml) - Html - @@ -39,9 +39,9 @@ Document - RazorIRToken - (870:27,64 [6] CSharp7.cshtml) - Html - \n RazorIRToken - (876:28,4 [6] CSharp7.cshtml) - Html - RazorIRToken - (882:28,10 [4] CSharp7.cshtml) - Html - \n\n - CSharpStatement - (886:30,0 [4] CSharp7.cshtml) + CSharpCode - (886:30,0 [4] CSharp7.cshtml) RazorIRToken - (886:30,0 [4] CSharp7.cshtml) - CSharp - - CSharpStatement - (891:30,5 [293] CSharp7.cshtml) + CSharpCode - (891:30,5 [293] CSharp7.cshtml) RazorIRToken - (891:30,5 [293] CSharp7.cshtml) - CSharp - switch (entry.Extra)\n {\n case int age:\n // Do something\n break;\n case IEnumerable childrenNames:\n // Do more something\n break;\n case null:\n // Do even more of something\n break;\n }\n HtmlContent - (1184:42,0 [7] CSharp7.cshtml) RazorIRToken - (1184:42,0 [7] CSharp7.cshtml) - Html - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt index c56f580285..1ef9f02f05 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt @@ -3,8 +3,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [0] CodeBlockAtEOF.cshtml) + CSharpCode - (2:0,2 [0] CodeBlockAtEOF.cshtml) RazorIRToken - (2:0,2 [0] CodeBlockAtEOF.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt index 42b07e76fd..77bb58485e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt @@ -3,5 +3,5 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [0] CodeBlockAtEOF.cshtml) + CSharpCode - (2:0,2 [0] CodeBlockAtEOF.cshtml) RazorIRToken - (2:0,2 [0] CodeBlockAtEOF.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt index 191efed4e1..4a50f729d5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt @@ -3,18 +3,18 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [17] CodeBlockWithTextElement.cshtml) + CSharpCode - (2:0,2 [17] CodeBlockWithTextElement.cshtml) RazorIRToken - (2:0,2 [17] CodeBlockWithTextElement.cshtml) - CSharp - \n var a = 1; HtmlContent - (25:1,21 [3] CodeBlockWithTextElement.cshtml) RazorIRToken - (25:1,21 [3] CodeBlockWithTextElement.cshtml) - Html - foo - CSharpStatement - (35:1,31 [22] CodeBlockWithTextElement.cshtml) + CSharpCode - (35:1,31 [22] CodeBlockWithTextElement.cshtml) RazorIRToken - (35:1,31 [22] CodeBlockWithTextElement.cshtml) - CSharp - \n var b = 1; HtmlContent - (63:2,23 [4] CodeBlockWithTextElement.cshtml) RazorIRToken - (63:2,23 [4] CodeBlockWithTextElement.cshtml) - Html - bar CSharpExpression - (69:2,29 [3] CodeBlockWithTextElement.cshtml) RazorIRToken - (69:2,29 [3] CodeBlockWithTextElement.cshtml) - CSharp - a+b - CSharpStatement - (80:2,40 [2] CodeBlockWithTextElement.cshtml) + CSharpCode - (80:2,40 [2] CodeBlockWithTextElement.cshtml) RazorIRToken - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt index 089fdc3d43..dbf324a495 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt @@ -3,15 +3,15 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [16] CodeBlockWithTextElement.cshtml) + CSharpCode - (2:0,2 [16] CodeBlockWithTextElement.cshtml) RazorIRToken - (2:0,2 [16] CodeBlockWithTextElement.cshtml) - CSharp - \n var a = 1; HtmlContent - (25:1,21 [3] CodeBlockWithTextElement.cshtml) RazorIRToken - (25:1,21 [3] CodeBlockWithTextElement.cshtml) - Html - foo - CSharpStatement - (35:1,31 [19] CodeBlockWithTextElement.cshtml) + CSharpCode - (35:1,31 [19] CodeBlockWithTextElement.cshtml) RazorIRToken - (35:1,31 [19] CodeBlockWithTextElement.cshtml) - CSharp - \n var b = 1; HtmlContent - (63:2,23 [4] CodeBlockWithTextElement.cshtml) RazorIRToken - (63:2,23 [4] CodeBlockWithTextElement.cshtml) - Html - bar CSharpExpression - (69:2,29 [3] CodeBlockWithTextElement.cshtml) RazorIRToken - (69:2,29 [3] CodeBlockWithTextElement.cshtml) - CSharp - a+b - CSharpStatement - (80:2,40 [2] CodeBlockWithTextElement.cshtml) + CSharpCode - (80:2,40 [2] CodeBlockWithTextElement.cshtml) RazorIRToken - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt index a17a896e09..04cc92b1a2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt @@ -3,8 +3,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [115] CodeBlock.cshtml) + CSharpCode - (2:0,2 [115] CodeBlock.cshtml) RazorIRToken - (2:0,2 [115] CodeBlock.cshtml) - CSharp - \n for(int i = 1; i <= 10; i++) {\n Output.Write("

Hello from C#, #" + i.ToString() + "

");\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt index 831203734a..83faacb507 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt @@ -3,5 +3,5 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [115] CodeBlock.cshtml) + CSharpCode - (2:0,2 [115] CodeBlock.cshtml) RazorIRToken - (2:0,2 [115] CodeBlock.cshtml) - CSharp - \n for(int i = 1; i <= 10; i++) {\n Output.Write("

Hello from C#, #" + i.ToString() + "

");\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt index b04bcf0e01..3a2b117b3b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt @@ -4,13 +4,13 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] ComplexTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:0,31 [4] ComplexTagHelpers.cshtml) RazorIRToken - (31:0,31 [4] ComplexTagHelpers.cshtml) - Html - \n\n - CSharpStatement - (36:2,1 [52] ComplexTagHelpers.cshtml) + CSharpCode - (36:2,1 [52] ComplexTagHelpers.cshtml) RazorIRToken - (36:2,1 [52] ComplexTagHelpers.cshtml) - CSharp - if (true)\n{\n var checkbox = "checkbox";\n\n HtmlContent - (88:6,4 [51] ComplexTagHelpers.cshtml) RazorIRToken - (88:6,4 [4] ComplexTagHelpers.cshtml) - Html -
RazorIRToken - (258:9,30 [14] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (273:10,13 [43] ComplexTagHelpers.cshtml) + CSharpCode - (273:10,13 [43] ComplexTagHelpers.cshtml) RazorIRToken - (273:10,13 [43] ComplexTagHelpers.cshtml) - CSharp - if (false)\n {\n TagHelper - (316:12,16 [83] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - @@ -66,7 +66,7 @@ Document - HtmlContent - (370:12,70 [22] ComplexTagHelpers.cshtml) RazorIRToken - (370:12,70 [22] ComplexTagHelpers.cshtml) - Html - Enter in a new time... CreateTagHelper - - TestNamespace.PTagHelper - CSharpStatement - (399:12,99 [66] ComplexTagHelpers.cshtml) + CSharpCode - (399:12,99 [66] ComplexTagHelpers.cshtml) RazorIRToken - (399:12,99 [66] ComplexTagHelpers.cshtml) - CSharp - \n }\n else\n {\n TagHelper - (465:16,16 [58] ComplexTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - @@ -85,7 +85,7 @@ Document - SetTagHelperProperty - (512:16,63 [4] ComplexTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes RazorIRToken - (512:16,63 [4] ComplexTagHelpers.cshtml) - CSharp - true CreateTagHelper - - TestNamespace.PTagHelper - CSharpStatement - (523:16,74 [18] ComplexTagHelpers.cshtml) + CSharpCode - (523:16,74 [18] ComplexTagHelpers.cshtml) RazorIRToken - (523:16,74 [18] ComplexTagHelpers.cshtml) - CSharp - \n TagHelper - (541:17,16 [50] ComplexTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - @@ -97,35 +97,35 @@ Document - SetTagHelperProperty - (554:17,29 [33] ComplexTagHelpers.cshtml) - tYPe - Type - HtmlAttributeValueStyle.SingleQuotes CSharpExpression - (556:17,31 [30] ComplexTagHelpers.cshtml) RazorIRToken - (556:17,31 [30] ComplexTagHelpers.cshtml) - CSharp - true ? "checkbox" : "anything" - CSharpStatement - (591:17,66 [18] ComplexTagHelpers.cshtml) + CSharpCode - (591:17,66 [18] ComplexTagHelpers.cshtml) RazorIRToken - (591:17,66 [18] ComplexTagHelpers.cshtml) - CSharp - \n TagHelper - (609:18,16 [81] ComplexTagHelpers.cshtml) - input - TagMode.StartTagOnly TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 SetTagHelperProperty - (622:18,29 [66] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes - CSharpStatement - (623:18,30 [11] ComplexTagHelpers.cshtml) + CSharpCode - (623:18,30 [11] ComplexTagHelpers.cshtml) RazorIRToken - (623:18,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml) RazorIRToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox - CSharpStatement - (655:18,62 [10] ComplexTagHelpers.cshtml) + CSharpCode - (655:18,62 [10] ComplexTagHelpers.cshtml) RazorIRToken - (655:18,62 [10] ComplexTagHelpers.cshtml) - CSharp - } else { HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml) RazorIRToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything - CSharpStatement - (686:18,93 [2] ComplexTagHelpers.cshtml) + CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml) RazorIRToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp - } SetTagHelperProperty - (622:18,29 [66] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes - CSharpStatement - (623:18,30 [11] ComplexTagHelpers.cshtml) + CSharpCode - (623:18,30 [11] ComplexTagHelpers.cshtml) RazorIRToken - (623:18,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml) RazorIRToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox - CSharpStatement - (655:18,62 [10] ComplexTagHelpers.cshtml) + CSharpCode - (655:18,62 [10] ComplexTagHelpers.cshtml) RazorIRToken - (655:18,62 [10] ComplexTagHelpers.cshtml) - CSharp - } else { HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml) RazorIRToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything - CSharpStatement - (686:18,93 [2] ComplexTagHelpers.cshtml) + CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml) RazorIRToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp - } - CSharpStatement - (690:18,97 [15] ComplexTagHelpers.cshtml) + CSharpCode - (690:18,97 [15] ComplexTagHelpers.cshtml) RazorIRToken - (690:18,97 [15] ComplexTagHelpers.cshtml) - CSharp - \n } HtmlContent - (705:19,13 [10] ComplexTagHelpers.cshtml) RazorIRToken - (705:19,13 [10] ComplexTagHelpers.cshtml) - Html - \n @@ -143,7 +143,7 @@ Document - TagHelperBody - HtmlContent - (816:21,95 [14] ComplexTagHelpers.cshtml) RazorIRToken - (816:21,95 [14] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (832:22,14 [21] ComplexTagHelpers.cshtml) + CSharpCode - (832:22,14 [21] ComplexTagHelpers.cshtml) RazorIRToken - (832:22,14 [21] ComplexTagHelpers.cshtml) - CSharp - var @object = false; HtmlContent - (856:23,0 [12] ComplexTagHelpers.cshtml) RazorIRToken - (856:23,0 [12] ComplexTagHelpers.cshtml) - Html - @@ -270,5 +270,5 @@ Document - HtmlContent - (1425:34,79 [12] ComplexTagHelpers.cshtml) RazorIRToken - (1425:34,79 [6] ComplexTagHelpers.cshtml) - Html - \n RazorIRToken - (1431:35,4 [6] ComplexTagHelpers.cshtml) - Html -
- CSharpStatement - (1437:35,10 [3] ComplexTagHelpers.cshtml) + CSharpCode - (1437:35,10 [3] ComplexTagHelpers.cshtml) RazorIRToken - (1437:35,10 [3] ComplexTagHelpers.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt index 0f255239c3..3640b9481e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt @@ -14,7 +14,7 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] ComplexTagHelpers.cshtml) RazorIRToken - (33:1,0 [2] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (36:2,1 [48] ComplexTagHelpers.cshtml) + CSharpCode - (36:2,1 [48] ComplexTagHelpers.cshtml) RazorIRToken - (36:2,1 [48] ComplexTagHelpers.cshtml) - CSharp - if (true)\n{\n var checkbox = "checkbox";\n\n HtmlContent - (84:6,0 [55] ComplexTagHelpers.cshtml) RazorIRToken - (84:6,0 [4] ComplexTagHelpers.cshtml) - Html - @@ -48,9 +48,9 @@ Document - RazorIRToken - (244:9,16 [9] ComplexTagHelpers.cshtml) - Html - Set Time: RazorIRToken - (253:9,25 [5] ComplexTagHelpers.cshtml) - Html - RazorIRToken - (258:9,30 [2] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (260:10,0 [12] ComplexTagHelpers.cshtml) + CSharpCode - (260:10,0 [12] ComplexTagHelpers.cshtml) RazorIRToken - (260:10,0 [12] ComplexTagHelpers.cshtml) - CSharp - - CSharpStatement - (273:10,13 [27] ComplexTagHelpers.cshtml) + CSharpCode - (273:10,13 [27] ComplexTagHelpers.cshtml) RazorIRToken - (273:10,13 [27] ComplexTagHelpers.cshtml) - CSharp - if (false)\n {\n HtmlContent - (300:12,0 [16] ComplexTagHelpers.cshtml) RazorIRToken - (300:12,0 [16] ComplexTagHelpers.cshtml) - Html - @@ -69,7 +69,7 @@ Document - CreateTagHelper - - TestNamespace.PTagHelper HtmlContent - (399:12,99 [2] ComplexTagHelpers.cshtml) RazorIRToken - (399:12,99 [2] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (401:13,0 [48] ComplexTagHelpers.cshtml) + CSharpCode - (401:13,0 [48] ComplexTagHelpers.cshtml) RazorIRToken - (401:13,0 [48] ComplexTagHelpers.cshtml) - CSharp - }\n else\n {\n HtmlContent - (449:16,0 [16] ComplexTagHelpers.cshtml) RazorIRToken - (449:16,0 [16] ComplexTagHelpers.cshtml) - Html - @@ -111,30 +111,30 @@ Document - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 SetTagHelperProperty - (622:18,29 [64] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes - CSharpStatement - (623:18,30 [10] ComplexTagHelpers.cshtml) + CSharpCode - (623:18,30 [10] ComplexTagHelpers.cshtml) RazorIRToken - (623:18,30 [10] ComplexTagHelpers.cshtml) - CSharp - if(true) { HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml) RazorIRToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox - CSharpStatement - (655:18,62 [9] ComplexTagHelpers.cshtml) + CSharpCode - (655:18,62 [9] ComplexTagHelpers.cshtml) RazorIRToken - (655:18,62 [9] ComplexTagHelpers.cshtml) - CSharp - } else { HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml) RazorIRToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything - CSharpStatement - (686:18,93 [2] ComplexTagHelpers.cshtml) + CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml) RazorIRToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp - } SetTagHelperProperty - (622:18,29 [64] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes - CSharpStatement - (623:18,30 [10] ComplexTagHelpers.cshtml) + CSharpCode - (623:18,30 [10] ComplexTagHelpers.cshtml) RazorIRToken - (623:18,30 [10] ComplexTagHelpers.cshtml) - CSharp - if(true) { HtmlContent - (640:18,47 [8] ComplexTagHelpers.cshtml) RazorIRToken - (640:18,47 [8] ComplexTagHelpers.cshtml) - Html - checkbox - CSharpStatement - (655:18,62 [9] ComplexTagHelpers.cshtml) + CSharpCode - (655:18,62 [9] ComplexTagHelpers.cshtml) RazorIRToken - (655:18,62 [9] ComplexTagHelpers.cshtml) - CSharp - } else { HtmlContent - (671:18,78 [8] ComplexTagHelpers.cshtml) RazorIRToken - (671:18,78 [8] ComplexTagHelpers.cshtml) - Html - anything - CSharpStatement - (686:18,93 [2] ComplexTagHelpers.cshtml) + CSharpCode - (686:18,93 [2] ComplexTagHelpers.cshtml) RazorIRToken - (686:18,93 [2] ComplexTagHelpers.cshtml) - CSharp - } HtmlContent - (690:18,97 [2] ComplexTagHelpers.cshtml) RazorIRToken - (690:18,97 [2] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (692:19,0 [15] ComplexTagHelpers.cshtml) + CSharpCode - (692:19,0 [15] ComplexTagHelpers.cshtml) RazorIRToken - (692:19,0 [15] ComplexTagHelpers.cshtml) - CSharp - }\n HtmlContent - (707:20,0 [8] ComplexTagHelpers.cshtml) RazorIRToken - (707:20,0 [8] ComplexTagHelpers.cshtml) - Html - @@ -152,9 +152,9 @@ Document - TagHelperBody - HtmlContent - (816:21,95 [2] ComplexTagHelpers.cshtml) RazorIRToken - (816:21,95 [2] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (818:22,0 [12] ComplexTagHelpers.cshtml) + CSharpCode - (818:22,0 [12] ComplexTagHelpers.cshtml) RazorIRToken - (818:22,0 [12] ComplexTagHelpers.cshtml) - CSharp - - CSharpStatement - (832:22,14 [21] ComplexTagHelpers.cshtml) + CSharpCode - (832:22,14 [21] ComplexTagHelpers.cshtml) RazorIRToken - (832:22,14 [21] ComplexTagHelpers.cshtml) - CSharp - var @object = false; HtmlContent - (856:23,0 [12] ComplexTagHelpers.cshtml) RazorIRToken - (856:23,0 [12] ComplexTagHelpers.cshtml) - Html - @@ -273,5 +273,5 @@ Document - RazorIRToken - (1425:34,79 [6] ComplexTagHelpers.cshtml) - Html - \n RazorIRToken - (1431:35,4 [6] ComplexTagHelpers.cshtml) - Html - RazorIRToken - (1437:35,10 [2] ComplexTagHelpers.cshtml) - Html - \n - CSharpStatement - (1439:36,0 [1] ComplexTagHelpers.cshtml) + CSharpCode - (1439:36,0 [1] ComplexTagHelpers.cshtml) RazorIRToken - (1439:36,0 [1] ComplexTagHelpers.cshtml) - CSharp - } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt index 7296cb478f..75f04ef864 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt @@ -3,16 +3,16 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [48] ConditionalAttributes.cshtml) + CSharpCode - (2:0,2 [48] ConditionalAttributes.cshtml) RazorIRToken - (2:0,2 [48] ConditionalAttributes.cshtml) - CSharp - \n var ch = true;\n var cls = "bar";\n HtmlContent - (50:3,4 [16] ConditionalAttributes.cshtml) RazorIRToken - (50:3,4 [2] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (66:3,20 [6] ConditionalAttributes.cshtml) + CSharpCode - (66:3,20 [6] ConditionalAttributes.cshtml) RazorIRToken - (66:3,20 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (72:4,4 [2] ConditionalAttributes.cshtml) RazorIRToken - (72:4,4 [2] ConditionalAttributes.cshtml) - Html -

- CSharpStatement - (90:4,22 [6] ConditionalAttributes.cshtml) + CSharpCode - (90:4,22 [6] ConditionalAttributes.cshtml) RazorIRToken - (90:4,22 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (96:5,4 [2] ConditionalAttributes.cshtml) RazorIRToken - (96:5,4 [2] ConditionalAttributes.cshtml) - Html -

- CSharpStatement - (118:5,26 [6] ConditionalAttributes.cshtml) + CSharpCode - (118:5,26 [6] ConditionalAttributes.cshtml) RazorIRToken - (118:5,26 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (124:6,4 [2] ConditionalAttributes.cshtml) RazorIRToken - (124:6,4 [2] ConditionalAttributes.cshtml) - Html -

- CSharpStatement - (146:6,26 [6] ConditionalAttributes.cshtml) + CSharpCode - (146:6,26 [6] ConditionalAttributes.cshtml) RazorIRToken - (146:6,26 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (152:7,4 [22] ConditionalAttributes.cshtml) RazorIRToken - (152:7,4 [6] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (191:7,43 [6] ConditionalAttributes.cshtml) + CSharpCode - (191:7,43 [6] ConditionalAttributes.cshtml) RazorIRToken - (191:7,43 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (197:8,4 [22] ConditionalAttributes.cshtml) RazorIRToken - (197:8,4 [6] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (240:8,47 [6] ConditionalAttributes.cshtml) + CSharpCode - (240:8,47 [6] ConditionalAttributes.cshtml) RazorIRToken - (240:8,47 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (246:9,4 [2] ConditionalAttributes.cshtml) RazorIRToken - (246:9,4 [2] ConditionalAttributes.cshtml) - Html -

- CSharpStatement - (285:9,43 [6] ConditionalAttributes.cshtml) + CSharpCode - (285:9,43 [6] ConditionalAttributes.cshtml) RazorIRToken - (285:9,43 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (291:10,4 [18] ConditionalAttributes.cshtml) RazorIRToken - (291:10,4 [2] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (309:10,22 [6] ConditionalAttributes.cshtml) + CSharpCode - (309:10,22 [6] ConditionalAttributes.cshtml) RazorIRToken - (309:10,22 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (315:11,4 [7] ConditionalAttributes.cshtml) RazorIRToken - (315:11,4 [7] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (407:11,96 [6] ConditionalAttributes.cshtml) + CSharpCode - (407:11,96 [6] ConditionalAttributes.cshtml) RazorIRToken - (407:11,96 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (413:12,4 [7] ConditionalAttributes.cshtml) RazorIRToken - (413:12,4 [7] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (521:12,112 [6] ConditionalAttributes.cshtml) + CSharpCode - (521:12,112 [6] ConditionalAttributes.cshtml) RazorIRToken - (521:12,112 [6] ConditionalAttributes.cshtml) - CSharp - \n HtmlContent - (527:13,4 [111] ConditionalAttributes.cshtml) RazorIRToken - (527:13,4 [7] ConditionalAttributes.cshtml) - Html - - CSharpStatement - (638:13,115 [2] ConditionalAttributes.cshtml) + CSharpCode - (638:13,115 [2] ConditionalAttributes.cshtml) RazorIRToken - (638:13,115 [2] ConditionalAttributes.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt index 70b557fa28..98d1e0d4d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [44] ConditionalAttributes.cshtml) + CSharpCode - (2:0,2 [44] ConditionalAttributes.cshtml) RazorIRToken - (2:0,2 [44] ConditionalAttributes.cshtml) - CSharp - \n var ch = true;\n var cls = "bar";\n HtmlContent - (46:3,0 [28] ConditionalAttributes.cshtml) RazorIRToken - (46:3,0 [4] ConditionalAttributes.cshtml) - Html - @@ -62,7 +62,7 @@ Document - RazorIRToken - (242:9,0 [4] ConditionalAttributes.cshtml) - Html - RazorIRToken - (246:9,4 [2] ConditionalAttributes.cshtml) - Html -

RazorIRToken - (629:13,106 [9] ConditionalAttributes.cshtml) - Html - RazorIRToken - (638:13,115 [2] ConditionalAttributes.cshtml) - Html - \n - CSharpStatement - (640:14,0 [0] ConditionalAttributes.cshtml) + CSharpCode - (640:14,0 [0] ConditionalAttributes.cshtml) RazorIRToken - (640:14,0 [0] ConditionalAttributes.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt index 86f743fd1d..57ac9195da 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt @@ -4,13 +4,13 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DesignTime_DesignTime - - DesignTimeDirective - DirectiveToken - (173:11,9 [6] DesignTime.cshtml) - Footer - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [19] DesignTime.cshtml) RazorIRToken - (0:0,0 [5] DesignTime.cshtml) - Html -

RazorIRToken - (5:0,5 [14] DesignTime.cshtml) - Html - \n - CSharpStatement - (20:1,13 [36] DesignTime.cshtml) + CSharpCode - (20:1,13 [36] DesignTime.cshtml) RazorIRToken - (20:1,13 [36] DesignTime.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n HtmlContent - (56:2,4 [17] DesignTime.cshtml) RazorIRToken - (56:2,4 [3] DesignTime.cshtml) - Html -

@@ -19,7 +19,7 @@ Document - RazorIRToken - (74:2,22 [1] DesignTime.cshtml) - CSharp - i HtmlContent - (75:2,23 [4] DesignTime.cshtml) RazorIRToken - (75:2,23 [4] DesignTime.cshtml) - Html -

- CSharpStatement - (79:2,27 [15] DesignTime.cshtml) + CSharpCode - (79:2,27 [15] DesignTime.cshtml) RazorIRToken - (79:2,27 [15] DesignTime.cshtml) - CSharp - \n } HtmlContent - (94:3,13 [17] DesignTime.cshtml) RazorIRToken - (94:3,13 [2] DesignTime.cshtml) - Html - \n @@ -47,7 +47,7 @@ Document - RazorIRToken - (154:8,26 [2] DesignTime.cshtml) - Html - \n RazorIRToken - (156:9,0 [4] DesignTime.cshtml) - Html -

RazorIRToken - (160:9,4 [4] DesignTime.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("Footer", async (__razor_section_writer) => { HtmlContent - (181:11,17 [22] DesignTime.cshtml) RazorIRToken - (181:11,17 [6] DesignTime.cshtml) - Html - \n @@ -59,5 +59,5 @@ Document - RazorIRToken - (204:13,5 [3] DesignTime.cshtml) - CSharp - bar HtmlContent - (207:13,8 [2] DesignTime.cshtml) RazorIRToken - (207:13,8 [2] DesignTime.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt index 2e98f2e5bb..7f3f6cd781 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] DuplicateAttributeTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs index 8b40693ed1..774ba87277 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs @@ -1,14 +1,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles { #line hidden - using System; - using System.Threading.Tasks; public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_DesignTime { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -System.Object __typeHelper = "*, TestAssembly"; +global::System.Object __typeHelper = "*, TestAssembly"; } ))(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt index 6f40ea62d1..92cbbe1d27 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.ir.txt @@ -1,29 +1,26 @@ Document - Checksum - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles - UsingStatement - - System - UsingStatement - - System.Threading.Tasks ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_DesignTime - - - DirectiveTokenHelper - - CSharpStatement - - #pragma warning disable 219 - CSharpStatement - - private void __RazorDirectiveTokenHelpers__() { + DesignTimeDirective - DirectiveToken - (14:0,14 [17] DuplicateTargetTagHelper.cshtml) - "*, TestAssembly" - CSharpStatement - - } - CSharpStatement - - #pragma warning restore 219 - CSharpStatement - - private static System.Object __o = null; + CSharpCode - + RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.InputTagHelper - TestNamespace.CatchAllTagHelper - RazorMethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - HtmlContent - (31:0,31 [4] DuplicateTargetTagHelper.cshtml) - \n\n - TagHelper - (35:2,0 [40] DuplicateTargetTagHelper.cshtml) - InitializeTagHelperStructure - - input - TagMode.SelfClosing + MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync + HtmlContent - (31:0,31 [4] DuplicateTargetTagHelper.cshtml) + RazorIRToken - (31:0,31 [4] DuplicateTargetTagHelper.cshtml) - Html - \n\n + TagHelper - (35:2,0 [40] DuplicateTargetTagHelper.cshtml) - input - TagMode.SelfClosing + TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper SetTagHelperProperty - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes - HtmlContent - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - checkbox + HtmlContent - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) + RazorIRToken - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - Html - checkbox SetTagHelperProperty - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes - HtmlContent - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - checkbox + HtmlContent - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) + RazorIRToken - (48:2,13 [8] DuplicateTargetTagHelper.cshtml) - Html - checkbox SetTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes - HtmlContent - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - true + RazorIRToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true SetTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes - HtmlContent - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - true - ExecuteTagHelpers - + RazorIRToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt index e48ca9f45d..9a0b6addd7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml) |"*, TestAssembly"| -Generated Location: (425:10,29 [17] ) +Generated Location: (378:8,37 [17] ) |"*, TestAssembly"| Source Location: (67:2,32 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml) |true| -Generated Location: (1382:26,41 [4] ) +Generated Location: (1335:24,41 [4] ) |true| diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs index 60d1b04250..beb1c831c7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.codegen.cs @@ -2,8 +2,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles { #line hidden - using System; - using System.Threading.Tasks; public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_Runtime { private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "checkbox", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes); @@ -20,7 +18,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles { if (__backed__tagHelperScopeManager == null) { - __backed__tagHelperScopeManager = new Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); } return __backed__tagHelperScopeManager; } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt index f1c1facca1..a744676bf8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_Runtime.ir.txt @@ -1,21 +1,19 @@ Document - Checksum - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles - UsingStatement - - System - UsingStatement - - System.Threading.Tasks ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateTargetTagHelper_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - TestNamespace.InputTagHelper - TestNamespace.CatchAllTagHelper - RazorMethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - HtmlContent - (33:1,0 [2] DuplicateTargetTagHelper.cshtml) - \n - TagHelper - (35:2,0 [40] DuplicateTargetTagHelper.cshtml) - InitializeTagHelperStructure - - input - TagMode.SelfClosing + MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync + HtmlContent - (33:1,0 [2] DuplicateTargetTagHelper.cshtml) + RazorIRToken - (33:1,0 [2] DuplicateTargetTagHelper.cshtml) - Html - \n + TagHelper - (35:2,0 [40] DuplicateTargetTagHelper.cshtml) - input - TagMode.SelfClosing + TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper SetPreallocatedTagHelperProperty - - __tagHelperAttribute_0 - type - Type SetPreallocatedTagHelperProperty - - __tagHelperAttribute_0 - type - Type SetTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes - HtmlContent - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - true + RazorIRToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true SetTagHelperProperty - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes - HtmlContent - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - true - ExecuteTagHelpers - + RazorIRToken - (67:2,32 [4] DuplicateTargetTagHelper.cshtml) - CSharp - true diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt index 603c82679e..64ca1a2b8b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] DynamicAttributeTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync @@ -24,7 +24,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes - CSharpStatementAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - + CSharpCodeAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty @@ -64,15 +64,15 @@ Document - RazorIRToken - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue HtmlContent - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) - Html - - CSharpStatement - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) + CSharpCode - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty - CSharpStatement - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) + CSharpCode - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) - CSharp - } else { CSharpExpression - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false - CSharpStatement - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) + CSharpCode - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) - CSharp - } HtmlContent - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) - Html - @@ -81,7 +81,7 @@ Document - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes CSharpExpressionAttributeValue - (347:9,16 [14] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue - CSharpStatementAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) - + CSharpCodeAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty @@ -113,7 +113,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes - CSharpStatementAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - + CSharpCodeAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt index 5163596b9c..1a14e535f1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt @@ -20,7 +20,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes - CSharpStatementAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - + CSharpCodeAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty @@ -60,15 +60,15 @@ Document - RazorIRToken - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue HtmlContent - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) - Html - - CSharpStatement - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) + CSharpCode - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty - CSharpStatement - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) + CSharpCode - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) - CSharp - } else { CSharpExpression - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false - CSharpStatement - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) + CSharpCode - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) - CSharp - } HtmlContent - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) - Html - @@ -77,7 +77,7 @@ Document - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes CSharpExpressionAttributeValue - (347:9,16 [14] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue - CSharpStatementAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) - + CSharpCodeAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty @@ -109,7 +109,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes - CSharpStatementAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - + CSharpCodeAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - RazorIRToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) RazorIRToken - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt index 5779e92d51..a1d5cdc0ee 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] EmptyAttributeTagHelpers.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt index 1eeaf2009b..27db5d0b40 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt @@ -3,10 +3,10 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] EmptyCodeBlock.cshtml) RazorIRToken - (0:0,0 [18] EmptyCodeBlock.cshtml) - Html - This is markup\n\n - CSharpStatement - (20:2,2 [0] EmptyCodeBlock.cshtml) + CSharpCode - (20:2,2 [0] EmptyCodeBlock.cshtml) RazorIRToken - (20:2,2 [0] EmptyCodeBlock.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt index 998914f3ad..5fc735bcfc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt @@ -5,5 +5,5 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] EmptyCodeBlock.cshtml) RazorIRToken - (0:0,0 [18] EmptyCodeBlock.cshtml) - Html - This is markup\n\n - CSharpStatement - (20:2,2 [0] EmptyCodeBlock.cshtml) + CSharpCode - (20:2,2 [0] EmptyCodeBlock.cshtml) RazorIRToken - (20:2,2 [0] EmptyCodeBlock.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt index 31f9aaf178..b33e22c7df 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] EmptyExplicitExpression.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt index 52d02b0507..d0d5c63e3e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt @@ -3,12 +3,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) + CSharpCode - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) RazorIRToken - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n CSharpExpression - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml) RazorIRToken - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml) - CSharp - - CSharpStatement - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) + CSharpCode - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) RazorIRToken - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt index 47ca6df32c..e348719b6f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt @@ -3,9 +3,9 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) + CSharpCode - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) RazorIRToken - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n CSharpExpression - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml) RazorIRToken - (9:1,5 [0] EmptyImplicitExpressionInCode.cshtml) - CSharp - - CSharpStatement - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) + CSharpCode - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) RazorIRToken - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt index 30e264bc1c..58feed26c7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] EmptyImplicitExpression.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt index 8e9f04eed4..f866befab7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt @@ -4,13 +4,13 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] EnumTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.InputTagHelper - TestNamespace.CatchAllTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:0,31 [4] EnumTagHelpers.cshtml) RazorIRToken - (31:0,31 [4] EnumTagHelpers.cshtml) - Html - \n\n - CSharpStatement - (37:2,2 [39] EnumTagHelpers.cshtml) + CSharpCode - (37:2,2 [39] EnumTagHelpers.cshtml) RazorIRToken - (37:2,2 [39] EnumTagHelpers.cshtml) - CSharp - \n var enumValue = MyEnum.MyValue;\n HtmlContent - (79:5,0 [2] EnumTagHelpers.cshtml) RazorIRToken - (79:5,0 [2] EnumTagHelpers.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt index 63b9072b18..a9fe7925e6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt @@ -6,7 +6,7 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] EnumTagHelpers.cshtml) RazorIRToken - (33:1,0 [2] EnumTagHelpers.cshtml) - Html - \n - CSharpStatement - (37:2,2 [39] EnumTagHelpers.cshtml) + CSharpCode - (37:2,2 [39] EnumTagHelpers.cshtml) RazorIRToken - (37:2,2 [39] EnumTagHelpers.cshtml) - CSharp - \n var enumValue = MyEnum.MyValue;\n HtmlContent - (79:5,0 [2] EnumTagHelpers.cshtml) RazorIRToken - (79:5,0 [2] EnumTagHelpers.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt index 94706a2045..14cadf93cb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] EscapedTagHelpers.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt index 4c021ad3c4..660fffd346 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] ExplicitExpressionAtEOF.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt index e2a8830332..f1b19abf8a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [5] ExplicitExpressionWithMarkup.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt index ab9328c525..6d69d96ecd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [8] ExplicitExpression.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt index b4092b1535..79ce701414 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt @@ -3,34 +3,34 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [51] ExpressionsInCode.cshtml) + CSharpCode - (2:0,2 [51] ExpressionsInCode.cshtml) RazorIRToken - (2:0,2 [51] ExpressionsInCode.cshtml) - CSharp - \n object foo = null;\n string bar = "Foo";\n HtmlContent - (56:4,0 [2] ExpressionsInCode.cshtml) RazorIRToken - (56:4,0 [2] ExpressionsInCode.cshtml) - Html - \n - CSharpStatement - (59:5,1 [23] ExpressionsInCode.cshtml) + CSharpCode - (59:5,1 [23] ExpressionsInCode.cshtml) RazorIRToken - (59:5,1 [23] ExpressionsInCode.cshtml) - CSharp - if(foo != null) {\n CSharpExpression - (83:6,5 [3] ExpressionsInCode.cshtml) RazorIRToken - (83:6,5 [3] ExpressionsInCode.cshtml) - CSharp - foo - CSharpStatement - (86:6,8 [16] ExpressionsInCode.cshtml) + CSharpCode - (86:6,8 [16] ExpressionsInCode.cshtml) RazorIRToken - (86:6,8 [16] ExpressionsInCode.cshtml) - CSharp - \n} else {\n HtmlContent - (102:8,4 [19] ExpressionsInCode.cshtml) RazorIRToken - (102:8,4 [3] ExpressionsInCode.cshtml) - Html -

RazorIRToken - (105:8,7 [12] ExpressionsInCode.cshtml) - Html - Foo is Null! RazorIRToken - (117:8,19 [4] ExpressionsInCode.cshtml) - Html -

- CSharpStatement - (121:8,23 [3] ExpressionsInCode.cshtml) + CSharpCode - (121:8,23 [3] ExpressionsInCode.cshtml) RazorIRToken - (121:8,23 [3] ExpressionsInCode.cshtml) - CSharp - \n} HtmlContent - (124:9,1 [9] ExpressionsInCode.cshtml) RazorIRToken - (124:9,1 [4] ExpressionsInCode.cshtml) - Html - \n\n RazorIRToken - (128:11,0 [3] ExpressionsInCode.cshtml) - Html -

RazorIRToken - (131:11,3 [2] ExpressionsInCode.cshtml) - Html - \n - CSharpStatement - (134:12,1 [38] ExpressionsInCode.cshtml) + CSharpCode - (134:12,1 [38] ExpressionsInCode.cshtml) RazorIRToken - (134:12,1 [38] ExpressionsInCode.cshtml) - CSharp - if(!String.IsNullOrEmpty(bar)) {\n CSharpExpression - (174:13,6 [21] ExpressionsInCode.cshtml) RazorIRToken - (174:13,6 [21] ExpressionsInCode.cshtml) - CSharp - bar.Replace("F", "B") - CSharpStatement - (196:13,28 [3] ExpressionsInCode.cshtml) + CSharpCode - (196:13,28 [3] ExpressionsInCode.cshtml) RazorIRToken - (196:13,28 [3] ExpressionsInCode.cshtml) - CSharp - \n} HtmlContent - (199:14,1 [6] ExpressionsInCode.cshtml) RazorIRToken - (199:14,1 [2] ExpressionsInCode.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt index d93833f4c2..084d7a339c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt @@ -3,15 +3,15 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [51] ExpressionsInCode.cshtml) + CSharpCode - (2:0,2 [51] ExpressionsInCode.cshtml) RazorIRToken - (2:0,2 [51] ExpressionsInCode.cshtml) - CSharp - \n object foo = null;\n string bar = "Foo";\n HtmlContent - (56:4,0 [2] ExpressionsInCode.cshtml) RazorIRToken - (56:4,0 [2] ExpressionsInCode.cshtml) - Html - \n - CSharpStatement - (59:5,1 [23] ExpressionsInCode.cshtml) + CSharpCode - (59:5,1 [23] ExpressionsInCode.cshtml) RazorIRToken - (59:5,1 [23] ExpressionsInCode.cshtml) - CSharp - if(foo != null) {\n CSharpExpression - (83:6,5 [3] ExpressionsInCode.cshtml) RazorIRToken - (83:6,5 [3] ExpressionsInCode.cshtml) - CSharp - foo - CSharpStatement - (86:6,8 [12] ExpressionsInCode.cshtml) + CSharpCode - (86:6,8 [12] ExpressionsInCode.cshtml) RazorIRToken - (86:6,8 [12] ExpressionsInCode.cshtml) - CSharp - \n} else {\n HtmlContent - (98:8,0 [25] ExpressionsInCode.cshtml) RazorIRToken - (98:8,0 [4] ExpressionsInCode.cshtml) - Html - @@ -19,17 +19,17 @@ Document - RazorIRToken - (105:8,7 [12] ExpressionsInCode.cshtml) - Html - Foo is Null! RazorIRToken - (117:8,19 [4] ExpressionsInCode.cshtml) - Html -

RazorIRToken - (121:8,23 [2] ExpressionsInCode.cshtml) - Html - \n - CSharpStatement - (123:9,0 [3] ExpressionsInCode.cshtml) + CSharpCode - (123:9,0 [3] ExpressionsInCode.cshtml) RazorIRToken - (123:9,0 [3] ExpressionsInCode.cshtml) - CSharp - }\n HtmlContent - (126:10,0 [7] ExpressionsInCode.cshtml) RazorIRToken - (126:10,0 [2] ExpressionsInCode.cshtml) - Html - \n RazorIRToken - (128:11,0 [3] ExpressionsInCode.cshtml) - Html -

RazorIRToken - (131:11,3 [2] ExpressionsInCode.cshtml) - Html - \n - CSharpStatement - (134:12,1 [38] ExpressionsInCode.cshtml) + CSharpCode - (134:12,1 [38] ExpressionsInCode.cshtml) RazorIRToken - (134:12,1 [38] ExpressionsInCode.cshtml) - CSharp - if(!String.IsNullOrEmpty(bar)) {\n CSharpExpression - (174:13,6 [21] ExpressionsInCode.cshtml) RazorIRToken - (174:13,6 [21] ExpressionsInCode.cshtml) - CSharp - bar.Replace("F", "B") - CSharpStatement - (196:13,28 [5] ExpressionsInCode.cshtml) + CSharpCode - (196:13,28 [5] ExpressionsInCode.cshtml) RazorIRToken - (196:13,28 [5] ExpressionsInCode.cshtml) - CSharp - \n}\n HtmlContent - (201:15,0 [4] ExpressionsInCode.cshtml) RazorIRToken - (201:15,0 [4] ExpressionsInCode.cshtml) - Html -

diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt index 8217af1c65..71287f1ba0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt @@ -3,10 +3,10 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [5] FunctionsBlockMinimal.cshtml) RazorIRToken - (0:0,0 [5] FunctionsBlockMinimal.cshtml) - Html - \n\n - CSharpStatement - (16:2,12 [55] FunctionsBlockMinimal.cshtml) + CSharpCode - (16:2,12 [55] FunctionsBlockMinimal.cshtml) RazorIRToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n return input + "!";\n}\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt index d6536081f1..7fe6533f30 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt @@ -5,7 +5,7 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [4] FunctionsBlockMinimal.cshtml) RazorIRToken - (0:0,0 [4] FunctionsBlockMinimal.cshtml) - Html - \n\n - CSharpStatement - (4:2,0 [1] FunctionsBlockMinimal.cshtml) + CSharpCode - (4:2,0 [1] FunctionsBlockMinimal.cshtml) RazorIRToken - (4:2,0 [1] FunctionsBlockMinimal.cshtml) - CSharp - - CSharpStatement - (16:2,12 [55] FunctionsBlockMinimal.cshtml) + CSharpCode - (16:2,12 [55] FunctionsBlockMinimal.cshtml) RazorIRToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n return input + "!";\n}\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt index e8485013da..6e0a18351c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (17:2,1 [4] FunctionsBlock.cshtml) @@ -12,7 +12,7 @@ Document - RazorIRToken - (138:9,1 [28] FunctionsBlock.cshtml) - Html - \n\nHere's a random number: CSharpExpression - (167:11,25 [11] FunctionsBlock.cshtml) RazorIRToken - (167:11,25 [11] FunctionsBlock.cshtml) - CSharp - RandomInt() - CSharpStatement - (12:0,12 [4] FunctionsBlock.cshtml) + CSharpCode - (12:0,12 [4] FunctionsBlock.cshtml) RazorIRToken - (12:0,12 [4] FunctionsBlock.cshtml) - CSharp - \n\n - CSharpStatement - (33:4,12 [104] FunctionsBlock.cshtml) + CSharpCode - (33:4,12 [104] FunctionsBlock.cshtml) RazorIRToken - (33:4,12 [104] FunctionsBlock.cshtml) - CSharp - \n Random _rand = new Random();\n private int RandomInt() {\n return _rand.Next();\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt index f15ae75c5d..2288d1b997 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt @@ -9,7 +9,7 @@ Document - RazorIRToken - (140:10,0 [26] FunctionsBlock.cshtml) - Html - \nHere's a random number: CSharpExpression - (167:11,25 [11] FunctionsBlock.cshtml) RazorIRToken - (167:11,25 [11] FunctionsBlock.cshtml) - CSharp - RandomInt() - CSharpStatement - (12:0,12 [4] FunctionsBlock.cshtml) + CSharpCode - (12:0,12 [4] FunctionsBlock.cshtml) RazorIRToken - (12:0,12 [4] FunctionsBlock.cshtml) - CSharp - \n\n - CSharpStatement - (33:4,12 [104] FunctionsBlock.cshtml) + CSharpCode - (33:4,12 [104] FunctionsBlock.cshtml) RazorIRToken - (33:4,12 [104] FunctionsBlock.cshtml) - CSharp - \n Random _rand = new Random();\n private int RandomInt() {\n return _rand.Next();\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt index e270d4bb26..37f87d9c41 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt @@ -3,10 +3,10 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] HiddenSpansInCode.cshtml) + CSharpCode - (2:0,2 [6] HiddenSpansInCode.cshtml) RazorIRToken - (2:0,2 [6] HiddenSpansInCode.cshtml) - CSharp - \n - CSharpStatement - (9:1,5 [5] HiddenSpansInCode.cshtml) + CSharpCode - (9:1,5 [5] HiddenSpansInCode.cshtml) RazorIRToken - (9:1,5 [5] HiddenSpansInCode.cshtml) - CSharp - @Da\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt index 595529d9cc..3ba54e1059 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] HiddenSpansInCode.cshtml) + CSharpCode - (2:0,2 [6] HiddenSpansInCode.cshtml) RazorIRToken - (2:0,2 [6] HiddenSpansInCode.cshtml) - CSharp - \n - CSharpStatement - (9:1,5 [5] HiddenSpansInCode.cshtml) + CSharpCode - (9:1,5 [5] HiddenSpansInCode.cshtml) RazorIRToken - (9:1,5 [5] HiddenSpansInCode.cshtml) - CSharp - @Da\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt index cfc055b3d9..879828457d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Double.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt index e040840cd3..d47a18b60e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Single.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt index 0a387cc4b6..37996beac3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] ImplicitExpressionAtEOF.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt index 0410eb1e9e..cf6a13a8ad 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt @@ -3,10 +3,10 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (1:0,1 [36] ImplicitExpression.cshtml) + CSharpCode - (1:0,1 [36] ImplicitExpression.cshtml) RazorIRToken - (1:0,1 [36] ImplicitExpression.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n HtmlContent - (37:1,4 [17] ImplicitExpression.cshtml) RazorIRToken - (37:1,4 [3] ImplicitExpression.cshtml) - Html -

@@ -15,5 +15,5 @@ Document - RazorIRToken - (55:1,22 [1] ImplicitExpression.cshtml) - CSharp - i HtmlContent - (56:1,23 [4] ImplicitExpression.cshtml) RazorIRToken - (56:1,23 [4] ImplicitExpression.cshtml) - Html -

- CSharpStatement - (60:1,27 [3] ImplicitExpression.cshtml) + CSharpCode - (60:1,27 [3] ImplicitExpression.cshtml) RazorIRToken - (60:1,27 [3] ImplicitExpression.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt index 7c92070019..0d7253737c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (1:0,1 [32] ImplicitExpression.cshtml) + CSharpCode - (1:0,1 [32] ImplicitExpression.cshtml) RazorIRToken - (1:0,1 [32] ImplicitExpression.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n HtmlContent - (33:1,0 [21] ImplicitExpression.cshtml) RazorIRToken - (33:1,0 [4] ImplicitExpression.cshtml) - Html - @@ -14,5 +14,5 @@ Document - HtmlContent - (56:1,23 [6] ImplicitExpression.cshtml) RazorIRToken - (56:1,23 [4] ImplicitExpression.cshtml) - Html -

RazorIRToken - (60:1,27 [2] ImplicitExpression.cshtml) - Html - \n - CSharpStatement - (62:2,0 [1] ImplicitExpression.cshtml) + CSharpCode - (62:2,0 [1] ImplicitExpression.cshtml) RazorIRToken - (62:2,0 [1] ImplicitExpression.cshtml) - CSharp - } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt index 81f0f0f265..a57c63d69f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt @@ -12,7 +12,7 @@ Document - DirectiveToken - (212:10,16 [0] IncompleteDirectives.cshtml) - DirectiveToken - (231:11,17 [0] IncompleteDirectives.cshtml) - DirectiveToken - (250:12,17 [1] IncompleteDirectives.cshtml) - " - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml) @@ -39,21 +39,21 @@ Document - RazorIRToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n HtmlContent - (276:15,10 [4] IncompleteDirectives.cshtml) RazorIRToken - (276:15,10 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("", async (__razor_section_writer) => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml) RazorIRToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("", async (__razor_section_writer) => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (326:21,9 [4] IncompleteDirectives.cshtml) RazorIRToken - (326:21,9 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("", async (__razor_section_writer) => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (339:23,9 [3] IncompleteDirectives.cshtml) RazorIRToken - (339:23,9 [3] IncompleteDirectives.cshtml) - Html - {\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt index e7cb233e0d..a644bd5d59 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt @@ -15,21 +15,21 @@ Document - RazorIRToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n HtmlContent - (276:15,10 [4] IncompleteDirectives.cshtml) RazorIRToken - (276:15,10 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("", async () => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml) RazorIRToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("", async () => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (326:21,9 [4] IncompleteDirectives.cshtml) RazorIRToken - (326:21,9 [4] IncompleteDirectives.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("", async () => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (339:23,9 [3] IncompleteDirectives.cshtml) RazorIRToken - (339:23,9 [3] IncompleteDirectives.cshtml) - Html - {\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt index 1939b51859..7b0dc3a015 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] IncompleteTagHelper.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt index 38037f086a..252e54cfa4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_DesignTime - foo.bar>.boz - DesignTimeDirective - DirectiveToken - (20:2,10 [21] Inherits.cshtml) - foo.bar>.boz - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync CSharpExpression - (1:0,1 [5] Inherits.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt index 36206e05c5..f81b5fe35a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt @@ -4,18 +4,18 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_DesignTime - - DesignTimeDirective - DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("Link", async (__razor_section_writer) => { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (13:0,13 [23] InlineBlocks.cshtml) RazorIRToken - (13:0,13 [21] InlineBlocks.cshtml) - Html - (string link) {\n RazorIRToken - (34:1,4 [2] InlineBlocks.cshtml) - Html - { - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (13:0,13 [23] InlineBlocks.cshtml) RazorIRToken - (13:0,13 [21] InlineBlocks.cshtml) - Html - (string link) {\n RazorIRToken - (34:1,4 [2] InlineBlocks.cshtml) - Html - RazorIRToken - (38:2,18 [3] Instrumented.cshtml) - Html - Bar RazorIRToken - (41:2,21 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (45:2,25 [7] Instrumented.cshtml) + CSharpCode - (45:2,25 [7] Instrumented.cshtml) RazorIRToken - (45:2,25 [7] Instrumented.cshtml) - CSharp - ;\n HtmlContent - (54:3,6 [14] Instrumented.cshtml) RazorIRToken - (54:3,6 [14] Instrumented.cshtml) - Html - Hello, World\n - CSharpStatement - (68:4,0 [4] Instrumented.cshtml) + CSharpCode - (68:4,0 [4] Instrumented.cshtml) RazorIRToken - (68:4,0 [4] Instrumented.cshtml) - CSharp - HtmlContent - (72:4,4 [19] Instrumented.cshtml) RazorIRToken - (72:4,4 [3] Instrumented.cshtml) - Html -

RazorIRToken - (75:4,7 [12] Instrumented.cshtml) - Html - Hello, World RazorIRToken - (87:4,19 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (91:4,23 [2] Instrumented.cshtml) + CSharpCode - (91:4,23 [2] Instrumented.cshtml) RazorIRToken - (91:4,23 [2] Instrumented.cshtml) - CSharp - \n HtmlContent - (96:6,0 [2] Instrumented.cshtml) RazorIRToken - (96:6,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (99:7,1 [22] Instrumented.cshtml) + CSharpCode - (99:7,1 [22] Instrumented.cshtml) RazorIRToken - (99:7,1 [22] Instrumented.cshtml) - CSharp - while(i <= 10) {\n HtmlContent - (121:8,4 [19] Instrumented.cshtml) RazorIRToken - (121:8,4 [3] Instrumented.cshtml) - Html -

@@ -36,37 +36,37 @@ Document - RazorIRToken - (142:8,25 [1] Instrumented.cshtml) - CSharp - i HtmlContent - (144:8,27 [4] Instrumented.cshtml) RazorIRToken - (144:8,27 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (148:8,31 [16] Instrumented.cshtml) + CSharpCode - (148:8,31 [16] Instrumented.cshtml) RazorIRToken - (148:8,31 [16] Instrumented.cshtml) - CSharp - \n i += 1;\n} HtmlContent - (164:10,1 [4] Instrumented.cshtml) RazorIRToken - (164:10,1 [4] Instrumented.cshtml) - Html - \n\n - CSharpStatement - (169:12,1 [19] Instrumented.cshtml) + CSharpCode - (169:12,1 [19] Instrumented.cshtml) RazorIRToken - (169:12,1 [19] Instrumented.cshtml) - CSharp - if(i == 11) {\n HtmlContent - (188:13,4 [25] Instrumented.cshtml) RazorIRToken - (188:13,4 [3] Instrumented.cshtml) - Html -

RazorIRToken - (191:13,7 [18] Instrumented.cshtml) - Html - We wrote 10 lines! RazorIRToken - (209:13,25 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (213:13,29 [3] Instrumented.cshtml) + CSharpCode - (213:13,29 [3] Instrumented.cshtml) RazorIRToken - (213:13,29 [3] Instrumented.cshtml) - CSharp - \n} HtmlContent - (216:14,1 [4] Instrumented.cshtml) RazorIRToken - (216:14,1 [4] Instrumented.cshtml) - Html - \n\n - CSharpStatement - (221:16,1 [35] Instrumented.cshtml) + CSharpCode - (221:16,1 [35] Instrumented.cshtml) RazorIRToken - (221:16,1 [35] Instrumented.cshtml) - CSharp - switch(i) {\n case 11:\n HtmlContent - (256:18,8 [36] Instrumented.cshtml) RazorIRToken - (256:18,8 [3] Instrumented.cshtml) - Html -

RazorIRToken - (259:18,11 [29] Instrumented.cshtml) - Html - No really, we wrote 10 lines! RazorIRToken - (288:18,40 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (292:18,44 [40] Instrumented.cshtml) + CSharpCode - (292:18,44 [40] Instrumented.cshtml) RazorIRToken - (292:18,44 [40] Instrumented.cshtml) - CSharp - \n break;\n default:\n HtmlContent - (332:21,8 [29] Instrumented.cshtml) RazorIRToken - (332:21,8 [3] Instrumented.cshtml) - Html -

RazorIRToken - (335:21,11 [22] Instrumented.cshtml) - Html - Actually, we didn't... RazorIRToken - (357:21,33 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (361:21,37 [19] Instrumented.cshtml) + CSharpCode - (361:21,37 [19] Instrumented.cshtml) RazorIRToken - (361:21,37 [19] Instrumented.cshtml) - CSharp - \n break;\n} HtmlContent - (380:23,1 [4] Instrumented.cshtml) RazorIRToken - (380:23,1 [4] Instrumented.cshtml) - Html - \n\n - CSharpStatement - (385:25,1 [39] Instrumented.cshtml) + CSharpCode - (385:25,1 [39] Instrumented.cshtml) RazorIRToken - (385:25,1 [39] Instrumented.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n HtmlContent - (424:26,4 [25] Instrumented.cshtml) RazorIRToken - (424:26,4 [3] Instrumented.cshtml) - Html -

@@ -75,17 +75,17 @@ Document - RazorIRToken - (451:26,31 [1] Instrumented.cshtml) - CSharp - j HtmlContent - (453:26,33 [4] Instrumented.cshtml) RazorIRToken - (453:26,33 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (457:26,37 [3] Instrumented.cshtml) + CSharpCode - (457:26,37 [3] Instrumented.cshtml) RazorIRToken - (457:26,37 [3] Instrumented.cshtml) - CSharp - \n} HtmlContent - (460:27,1 [4] Instrumented.cshtml) RazorIRToken - (460:27,1 [4] Instrumented.cshtml) - Html - \n\n - CSharpStatement - (465:29,1 [11] Instrumented.cshtml) + CSharpCode - (465:29,1 [11] Instrumented.cshtml) RazorIRToken - (465:29,1 [11] Instrumented.cshtml) - CSharp - try {\n HtmlContent - (476:30,4 [35] Instrumented.cshtml) RazorIRToken - (476:30,4 [3] Instrumented.cshtml) - Html -

RazorIRToken - (479:30,7 [28] Instrumented.cshtml) - Html - That time, we wrote 5 lines! RazorIRToken - (507:30,35 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (511:30,39 [31] Instrumented.cshtml) + CSharpCode - (511:30,39 [31] Instrumented.cshtml) RazorIRToken - (511:30,39 [31] Instrumented.cshtml) - CSharp - \n} catch(Exception ex) {\n HtmlContent - (542:32,4 [29] Instrumented.cshtml) RazorIRToken - (542:32,4 [3] Instrumented.cshtml) - Html -

@@ -94,15 +94,15 @@ Document - RazorIRToken - (573:32,35 [10] Instrumented.cshtml) - CSharp - ex.Message HtmlContent - (584:32,46 [4] Instrumented.cshtml) RazorIRToken - (584:32,46 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (588:32,50 [3] Instrumented.cshtml) + CSharpCode - (588:32,50 [3] Instrumented.cshtml) RazorIRToken - (588:32,50 [3] Instrumented.cshtml) - CSharp - \n} HtmlContent - (591:33,1 [4] Instrumented.cshtml) RazorIRToken - (591:33,1 [4] Instrumented.cshtml) - Html - \n\n - CSharpStatement - (596:35,1 [26] Instrumented.cshtml) + CSharpCode - (596:35,1 [26] Instrumented.cshtml) RazorIRToken - (596:35,1 [26] Instrumented.cshtml) - CSharp - lock(new object()) {\n HtmlContent - (622:36,4 [47] Instrumented.cshtml) RazorIRToken - (622:36,4 [3] Instrumented.cshtml) - Html -

RazorIRToken - (625:36,7 [40] Instrumented.cshtml) - Html - This block is locked, for your security! RazorIRToken - (665:36,47 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (669:36,51 [3] Instrumented.cshtml) + CSharpCode - (669:36,51 [3] Instrumented.cshtml) RazorIRToken - (669:36,51 [3] Instrumented.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt index 45d109110e..1aa6d85ef0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt @@ -3,14 +3,14 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [32] Instrumented.cshtml) + CSharpCode - (2:0,2 [32] Instrumented.cshtml) RazorIRToken - (2:0,2 [32] Instrumented.cshtml) - CSharp - \n int i = 1;\n var foo = Template - (35:2,15 [10] Instrumented.cshtml) HtmlContent - (35:2,15 [10] Instrumented.cshtml) RazorIRToken - (35:2,15 [3] Instrumented.cshtml) - Html -

RazorIRToken - (38:2,18 [3] Instrumented.cshtml) - Html - Bar RazorIRToken - (41:2,21 [4] Instrumented.cshtml) - Html -

- CSharpStatement - (45:2,25 [3] Instrumented.cshtml) + CSharpCode - (45:2,25 [3] Instrumented.cshtml) RazorIRToken - (45:2,25 [3] Instrumented.cshtml) - CSharp - ;\n HtmlContent - (48:3,0 [4] Instrumented.cshtml) RazorIRToken - (48:3,0 [4] Instrumented.cshtml) - Html - @@ -21,11 +21,11 @@ Document - RazorIRToken - (75:4,7 [12] Instrumented.cshtml) - Html - Hello, World RazorIRToken - (87:4,19 [4] Instrumented.cshtml) - Html -

RazorIRToken - (91:4,23 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (93:5,0 [0] Instrumented.cshtml) + CSharpCode - (93:5,0 [0] Instrumented.cshtml) RazorIRToken - (93:5,0 [0] Instrumented.cshtml) - CSharp - HtmlContent - (96:6,0 [2] Instrumented.cshtml) RazorIRToken - (96:6,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (99:7,1 [18] Instrumented.cshtml) + CSharpCode - (99:7,1 [18] Instrumented.cshtml) RazorIRToken - (99:7,1 [18] Instrumented.cshtml) - CSharp - while(i <= 10) {\n HtmlContent - (117:8,0 [23] Instrumented.cshtml) RazorIRToken - (117:8,0 [4] Instrumented.cshtml) - Html - @@ -36,11 +36,11 @@ Document - HtmlContent - (144:8,27 [6] Instrumented.cshtml) RazorIRToken - (144:8,27 [4] Instrumented.cshtml) - Html -

RazorIRToken - (148:8,31 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (150:9,0 [16] Instrumented.cshtml) + CSharpCode - (150:9,0 [16] Instrumented.cshtml) RazorIRToken - (150:9,0 [16] Instrumented.cshtml) - CSharp - i += 1;\n}\n HtmlContent - (166:11,0 [2] Instrumented.cshtml) RazorIRToken - (166:11,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (169:12,1 [15] Instrumented.cshtml) + CSharpCode - (169:12,1 [15] Instrumented.cshtml) RazorIRToken - (169:12,1 [15] Instrumented.cshtml) - CSharp - if(i == 11) {\n HtmlContent - (184:13,0 [31] Instrumented.cshtml) RazorIRToken - (184:13,0 [4] Instrumented.cshtml) - Html - @@ -48,11 +48,11 @@ Document - RazorIRToken - (191:13,7 [18] Instrumented.cshtml) - Html - We wrote 10 lines! RazorIRToken - (209:13,25 [4] Instrumented.cshtml) - Html -

RazorIRToken - (213:13,29 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (215:14,0 [3] Instrumented.cshtml) + CSharpCode - (215:14,0 [3] Instrumented.cshtml) RazorIRToken - (215:14,0 [3] Instrumented.cshtml) - CSharp - }\n HtmlContent - (218:15,0 [2] Instrumented.cshtml) RazorIRToken - (218:15,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (221:16,1 [27] Instrumented.cshtml) + CSharpCode - (221:16,1 [27] Instrumented.cshtml) RazorIRToken - (221:16,1 [27] Instrumented.cshtml) - CSharp - switch(i) {\n case 11:\n HtmlContent - (248:18,0 [46] Instrumented.cshtml) RazorIRToken - (248:18,0 [8] Instrumented.cshtml) - Html - @@ -60,7 +60,7 @@ Document - RazorIRToken - (259:18,11 [29] Instrumented.cshtml) - Html - No really, we wrote 10 lines! RazorIRToken - (288:18,40 [4] Instrumented.cshtml) - Html -

RazorIRToken - (292:18,44 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (294:19,0 [30] Instrumented.cshtml) + CSharpCode - (294:19,0 [30] Instrumented.cshtml) RazorIRToken - (294:19,0 [30] Instrumented.cshtml) - CSharp - break;\n default:\n HtmlContent - (324:21,0 [39] Instrumented.cshtml) RazorIRToken - (324:21,0 [8] Instrumented.cshtml) - Html - @@ -68,11 +68,11 @@ Document - RazorIRToken - (335:21,11 [22] Instrumented.cshtml) - Html - Actually, we didn't... RazorIRToken - (357:21,33 [4] Instrumented.cshtml) - Html -

RazorIRToken - (361:21,37 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (363:22,0 [19] Instrumented.cshtml) + CSharpCode - (363:22,0 [19] Instrumented.cshtml) RazorIRToken - (363:22,0 [19] Instrumented.cshtml) - CSharp - break;\n}\n HtmlContent - (382:24,0 [2] Instrumented.cshtml) RazorIRToken - (382:24,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (385:25,1 [35] Instrumented.cshtml) + CSharpCode - (385:25,1 [35] Instrumented.cshtml) RazorIRToken - (385:25,1 [35] Instrumented.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n HtmlContent - (420:26,0 [29] Instrumented.cshtml) RazorIRToken - (420:26,0 [4] Instrumented.cshtml) - Html - @@ -83,11 +83,11 @@ Document - HtmlContent - (453:26,33 [6] Instrumented.cshtml) RazorIRToken - (453:26,33 [4] Instrumented.cshtml) - Html -

RazorIRToken - (457:26,37 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (459:27,0 [3] Instrumented.cshtml) + CSharpCode - (459:27,0 [3] Instrumented.cshtml) RazorIRToken - (459:27,0 [3] Instrumented.cshtml) - CSharp - }\n HtmlContent - (462:28,0 [2] Instrumented.cshtml) RazorIRToken - (462:28,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (465:29,1 [7] Instrumented.cshtml) + CSharpCode - (465:29,1 [7] Instrumented.cshtml) RazorIRToken - (465:29,1 [7] Instrumented.cshtml) - CSharp - try {\n HtmlContent - (472:30,0 [41] Instrumented.cshtml) RazorIRToken - (472:30,0 [4] Instrumented.cshtml) - Html - @@ -95,7 +95,7 @@ Document - RazorIRToken - (479:30,7 [28] Instrumented.cshtml) - Html - That time, we wrote 5 lines! RazorIRToken - (507:30,35 [4] Instrumented.cshtml) - Html -

RazorIRToken - (511:30,39 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (513:31,0 [25] Instrumented.cshtml) + CSharpCode - (513:31,0 [25] Instrumented.cshtml) RazorIRToken - (513:31,0 [25] Instrumented.cshtml) - CSharp - } catch(Exception ex) {\n HtmlContent - (538:32,0 [33] Instrumented.cshtml) RazorIRToken - (538:32,0 [4] Instrumented.cshtml) - Html - @@ -106,11 +106,11 @@ Document - HtmlContent - (584:32,46 [6] Instrumented.cshtml) RazorIRToken - (584:32,46 [4] Instrumented.cshtml) - Html -

RazorIRToken - (588:32,50 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (590:33,0 [3] Instrumented.cshtml) + CSharpCode - (590:33,0 [3] Instrumented.cshtml) RazorIRToken - (590:33,0 [3] Instrumented.cshtml) - CSharp - }\n HtmlContent - (593:34,0 [2] Instrumented.cshtml) RazorIRToken - (593:34,0 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (596:35,1 [22] Instrumented.cshtml) + CSharpCode - (596:35,1 [22] Instrumented.cshtml) RazorIRToken - (596:35,1 [22] Instrumented.cshtml) - CSharp - lock(new object()) {\n HtmlContent - (618:36,0 [53] Instrumented.cshtml) RazorIRToken - (618:36,0 [4] Instrumented.cshtml) - Html - @@ -118,5 +118,5 @@ Document - RazorIRToken - (625:36,7 [40] Instrumented.cshtml) - Html - This block is locked, for your security! RazorIRToken - (665:36,47 [4] Instrumented.cshtml) - Html -

RazorIRToken - (669:36,51 [2] Instrumented.cshtml) - Html - \n - CSharpStatement - (671:37,0 [1] Instrumented.cshtml) + CSharpCode - (671:37,0 [1] Instrumented.cshtml) RazorIRToken - (671:37,0 [1] Instrumented.cshtml) - CSharp - } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt index ab50e00d42..46c00bbd8c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt @@ -3,10 +3,10 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [46] MarkupInCodeBlock.cshtml) + CSharpCode - (2:0,2 [46] MarkupInCodeBlock.cshtml) RazorIRToken - (2:0,2 [46] MarkupInCodeBlock.cshtml) - CSharp - \n for(int i = 1; i <= 10; i++) {\n HtmlContent - (48:2,8 [19] MarkupInCodeBlock.cshtml) RazorIRToken - (48:2,8 [3] MarkupInCodeBlock.cshtml) - Html -

@@ -15,5 +15,5 @@ Document - RazorIRToken - (69:2,29 [12] MarkupInCodeBlock.cshtml) - CSharp - i.ToString() HtmlContent - (82:2,42 [4] MarkupInCodeBlock.cshtml) RazorIRToken - (82:2,42 [4] MarkupInCodeBlock.cshtml) - Html -

- CSharpStatement - (86:2,46 [9] MarkupInCodeBlock.cshtml) + CSharpCode - (86:2,46 [9] MarkupInCodeBlock.cshtml) RazorIRToken - (86:2,46 [9] MarkupInCodeBlock.cshtml) - CSharp - \n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt index c40140fe6e..43511b6540 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [38] MarkupInCodeBlock.cshtml) + CSharpCode - (2:0,2 [38] MarkupInCodeBlock.cshtml) RazorIRToken - (2:0,2 [38] MarkupInCodeBlock.cshtml) - CSharp - \n for(int i = 1; i <= 10; i++) {\n HtmlContent - (40:2,0 [27] MarkupInCodeBlock.cshtml) RazorIRToken - (40:2,0 [8] MarkupInCodeBlock.cshtml) - Html - @@ -14,5 +14,5 @@ Document - HtmlContent - (82:2,42 [6] MarkupInCodeBlock.cshtml) RazorIRToken - (82:2,42 [4] MarkupInCodeBlock.cshtml) - Html -

RazorIRToken - (86:2,46 [2] MarkupInCodeBlock.cshtml) - Html - \n - CSharpStatement - (88:3,0 [7] MarkupInCodeBlock.cshtml) + CSharpCode - (88:3,0 [7] MarkupInCodeBlock.cshtml) RazorIRToken - (88:3,0 [7] MarkupInCodeBlock.cshtml) - CSharp - }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt index ad66d62b32..69e78de03f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] MinimizedTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.CatchAllTagHelper - TestNamespace.InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt index 0ac4f33c61..46041a0fc6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt @@ -3,12 +3,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] NestedCSharp.cshtml) + CSharpCode - (2:0,2 [6] NestedCSharp.cshtml) RazorIRToken - (2:0,2 [6] NestedCSharp.cshtml) - CSharp - \n - CSharpStatement - (9:1,5 [53] NestedCSharp.cshtml) + CSharpCode - (9:1,5 [53] NestedCSharp.cshtml) RazorIRToken - (9:1,5 [53] NestedCSharp.cshtml) - CSharp - foreach (var result in (dynamic)Url)\n {\n HtmlContent - (62:3,8 [19] NestedCSharp.cshtml) RazorIRToken - (62:3,8 [5] NestedCSharp.cshtml) - Html -
@@ -18,7 +18,7 @@ Document - HtmlContent - (98:4,29 [17] NestedCSharp.cshtml) RazorIRToken - (98:4,29 [11] NestedCSharp.cshtml) - Html - .\n RazorIRToken - (109:5,8 [6] NestedCSharp.cshtml) - Html -
- CSharpStatement - (115:5,14 [7] NestedCSharp.cshtml) + CSharpCode - (115:5,14 [7] NestedCSharp.cshtml) RazorIRToken - (115:5,14 [7] NestedCSharp.cshtml) - CSharp - \n } - CSharpStatement - (122:6,5 [2] NestedCSharp.cshtml) + CSharpCode - (122:6,5 [2] NestedCSharp.cshtml) RazorIRToken - (122:6,5 [2] NestedCSharp.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt index 256268ae8c..62eaa8f6c3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt @@ -3,9 +3,9 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] NestedCSharp.cshtml) + CSharpCode - (2:0,2 [6] NestedCSharp.cshtml) RazorIRToken - (2:0,2 [6] NestedCSharp.cshtml) - CSharp - \n - CSharpStatement - (9:1,5 [45] NestedCSharp.cshtml) + CSharpCode - (9:1,5 [45] NestedCSharp.cshtml) RazorIRToken - (9:1,5 [45] NestedCSharp.cshtml) - CSharp - foreach (var result in (dynamic)Url)\n {\n HtmlContent - (54:3,0 [27] NestedCSharp.cshtml) RazorIRToken - (54:3,0 [8] NestedCSharp.cshtml) - Html - @@ -18,7 +18,7 @@ Document - RazorIRToken - (98:4,29 [11] NestedCSharp.cshtml) - Html - .\n RazorIRToken - (109:5,8 [6] NestedCSharp.cshtml) - Html -
RazorIRToken - (115:5,14 [2] NestedCSharp.cshtml) - Html - \n - CSharpStatement - (117:6,0 [5] NestedCSharp.cshtml) + CSharpCode - (117:6,0 [5] NestedCSharp.cshtml) RazorIRToken - (117:6,0 [5] NestedCSharp.cshtml) - CSharp - } - CSharpStatement - (122:6,5 [2] NestedCSharp.cshtml) + CSharpCode - (122:6,5 [2] NestedCSharp.cshtml) RazorIRToken - (122:6,5 [2] NestedCSharp.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt index 67ded343fc..99f6198753 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt @@ -3,12 +3,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (1:0,1 [15] NestedCodeBlocks.cshtml) + CSharpCode - (1:0,1 [15] NestedCodeBlocks.cshtml) RazorIRToken - (1:0,1 [15] NestedCodeBlocks.cshtml) - CSharp - if(foo) {\n - CSharpStatement - (17:1,5 [16] NestedCodeBlocks.cshtml) + CSharpCode - (17:1,5 [16] NestedCodeBlocks.cshtml) RazorIRToken - (17:1,5 [16] NestedCodeBlocks.cshtml) - CSharp - if(bar) {\n } - CSharpStatement - (33:2,5 [3] NestedCodeBlocks.cshtml) + CSharpCode - (33:2,5 [3] NestedCodeBlocks.cshtml) RazorIRToken - (33:2,5 [3] NestedCodeBlocks.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt index 9c6c9e2a37..4d8deb4883 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt @@ -3,9 +3,9 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (1:0,1 [15] NestedCodeBlocks.cshtml) + CSharpCode - (1:0,1 [15] NestedCodeBlocks.cshtml) RazorIRToken - (1:0,1 [15] NestedCodeBlocks.cshtml) - CSharp - if(foo) {\n - CSharpStatement - (17:1,5 [16] NestedCodeBlocks.cshtml) + CSharpCode - (17:1,5 [16] NestedCodeBlocks.cshtml) RazorIRToken - (17:1,5 [16] NestedCodeBlocks.cshtml) - CSharp - if(bar) {\n } - CSharpStatement - (33:2,5 [3] NestedCodeBlocks.cshtml) + CSharpCode - (33:2,5 [3] NestedCodeBlocks.cshtml) RazorIRToken - (33:2,5 [3] NestedCodeBlocks.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt index 97760a00cc..29219bec6f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] NestedScriptTagTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync @@ -25,7 +25,7 @@ Document - TagHelperBody - HtmlContent - (180:4,49 [14] NestedScriptTagTagHelpers.cshtml) RazorIRToken - (180:4,49 [14] NestedScriptTagTagHelpers.cshtml) - Html - \n - CSharpStatement - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml) + CSharpCode - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml) RazorIRToken - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml) - CSharp - for(var i = 0; i < 5; i++) {\n HtmlContent - (241:6,16 [68] NestedScriptTagTagHelpers.cshtml) RazorIRToken - (241:6,16 [7] NestedScriptTagTagHelpers.cshtml) - Html - RazorIRToken - (422:8,25 [2] NestedScriptTagTagHelpers.cshtml) - Html - \n - CSharpStatement - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml) + CSharpCode - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml) RazorIRToken - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml) - CSharp - }\n HtmlContent - (439:10,0 [129] NestedScriptTagTagHelpers.cshtml) RazorIRToken - (439:10,0 [12] NestedScriptTagTagHelpers.cshtml) - Html - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt index efdd5586d2..fd7ec93f4a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] NestedTagHelpers.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - SpanTagHelper - DivTagHelper - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt index 3389463079..143ada46b9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt @@ -3,14 +3,14 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [18] NoLinePragmas.cshtml) + CSharpCode - (2:0,2 [18] NoLinePragmas.cshtml) RazorIRToken - (2:0,2 [18] NoLinePragmas.cshtml) - CSharp - \n int i = 1;\n HtmlContent - (23:3,0 [2] NoLinePragmas.cshtml) RazorIRToken - (23:3,0 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (26:4,1 [22] NoLinePragmas.cshtml) + CSharpCode - (26:4,1 [22] NoLinePragmas.cshtml) RazorIRToken - (26:4,1 [22] NoLinePragmas.cshtml) - CSharp - while(i <= 10) {\n HtmlContent - (48:5,4 [19] NoLinePragmas.cshtml) RazorIRToken - (48:5,4 [3] NoLinePragmas.cshtml) - Html -

@@ -19,37 +19,37 @@ Document - RazorIRToken - (69:5,25 [1] NoLinePragmas.cshtml) - CSharp - i HtmlContent - (71:5,27 [4] NoLinePragmas.cshtml) RazorIRToken - (71:5,27 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (75:5,31 [16] NoLinePragmas.cshtml) + CSharpCode - (75:5,31 [16] NoLinePragmas.cshtml) RazorIRToken - (75:5,31 [16] NoLinePragmas.cshtml) - CSharp - \n i += 1;\n} HtmlContent - (91:7,1 [4] NoLinePragmas.cshtml) RazorIRToken - (91:7,1 [4] NoLinePragmas.cshtml) - Html - \n\n - CSharpStatement - (96:9,1 [19] NoLinePragmas.cshtml) + CSharpCode - (96:9,1 [19] NoLinePragmas.cshtml) RazorIRToken - (96:9,1 [19] NoLinePragmas.cshtml) - CSharp - if(i == 11) {\n HtmlContent - (115:10,4 [25] NoLinePragmas.cshtml) RazorIRToken - (115:10,4 [3] NoLinePragmas.cshtml) - Html -

RazorIRToken - (118:10,7 [18] NoLinePragmas.cshtml) - Html - We wrote 10 lines! RazorIRToken - (136:10,25 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (140:10,29 [3] NoLinePragmas.cshtml) + CSharpCode - (140:10,29 [3] NoLinePragmas.cshtml) RazorIRToken - (140:10,29 [3] NoLinePragmas.cshtml) - CSharp - \n} HtmlContent - (143:11,1 [4] NoLinePragmas.cshtml) RazorIRToken - (143:11,1 [4] NoLinePragmas.cshtml) - Html - \n\n - CSharpStatement - (148:13,1 [35] NoLinePragmas.cshtml) + CSharpCode - (148:13,1 [35] NoLinePragmas.cshtml) RazorIRToken - (148:13,1 [35] NoLinePragmas.cshtml) - CSharp - switch(i) {\n case 11:\n HtmlContent - (183:15,8 [36] NoLinePragmas.cshtml) RazorIRToken - (183:15,8 [3] NoLinePragmas.cshtml) - Html -

RazorIRToken - (186:15,11 [29] NoLinePragmas.cshtml) - Html - No really, we wrote 10 lines! RazorIRToken - (215:15,40 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (219:15,44 [40] NoLinePragmas.cshtml) + CSharpCode - (219:15,44 [40] NoLinePragmas.cshtml) RazorIRToken - (219:15,44 [40] NoLinePragmas.cshtml) - CSharp - \n break;\n default:\n HtmlContent - (259:18,8 [29] NoLinePragmas.cshtml) RazorIRToken - (259:18,8 [3] NoLinePragmas.cshtml) - Html -

RazorIRToken - (262:18,11 [22] NoLinePragmas.cshtml) - Html - Actually, we didn't... RazorIRToken - (284:18,33 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (288:18,37 [19] NoLinePragmas.cshtml) + CSharpCode - (288:18,37 [19] NoLinePragmas.cshtml) RazorIRToken - (288:18,37 [19] NoLinePragmas.cshtml) - CSharp - \n break;\n} HtmlContent - (307:20,1 [4] NoLinePragmas.cshtml) RazorIRToken - (307:20,1 [4] NoLinePragmas.cshtml) - Html - \n\n - CSharpStatement - (312:22,1 [39] NoLinePragmas.cshtml) + CSharpCode - (312:22,1 [39] NoLinePragmas.cshtml) RazorIRToken - (312:22,1 [39] NoLinePragmas.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n HtmlContent - (351:23,4 [25] NoLinePragmas.cshtml) RazorIRToken - (351:23,4 [3] NoLinePragmas.cshtml) - Html -

@@ -58,17 +58,17 @@ Document - RazorIRToken - (378:23,31 [1] NoLinePragmas.cshtml) - CSharp - j HtmlContent - (380:23,33 [4] NoLinePragmas.cshtml) RazorIRToken - (380:23,33 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (384:23,37 [3] NoLinePragmas.cshtml) + CSharpCode - (384:23,37 [3] NoLinePragmas.cshtml) RazorIRToken - (384:23,37 [3] NoLinePragmas.cshtml) - CSharp - \n} HtmlContent - (387:24,1 [4] NoLinePragmas.cshtml) RazorIRToken - (387:24,1 [4] NoLinePragmas.cshtml) - Html - \n\n - CSharpStatement - (392:26,1 [11] NoLinePragmas.cshtml) + CSharpCode - (392:26,1 [11] NoLinePragmas.cshtml) RazorIRToken - (392:26,1 [11] NoLinePragmas.cshtml) - CSharp - try {\n HtmlContent - (403:27,4 [35] NoLinePragmas.cshtml) RazorIRToken - (403:27,4 [3] NoLinePragmas.cshtml) - Html -

RazorIRToken - (406:27,7 [28] NoLinePragmas.cshtml) - Html - That time, we wrote 5 lines! RazorIRToken - (434:27,35 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (438:27,39 [31] NoLinePragmas.cshtml) + CSharpCode - (438:27,39 [31] NoLinePragmas.cshtml) RazorIRToken - (438:27,39 [31] NoLinePragmas.cshtml) - CSharp - \n} catch(Exception ex) {\n HtmlContent - (469:29,4 [29] NoLinePragmas.cshtml) RazorIRToken - (469:29,4 [3] NoLinePragmas.cshtml) - Html -

@@ -77,9 +77,9 @@ Document - RazorIRToken - (500:29,35 [10] NoLinePragmas.cshtml) - CSharp - ex.Message HtmlContent - (511:29,46 [4] NoLinePragmas.cshtml) RazorIRToken - (511:29,46 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (515:29,50 [7] NoLinePragmas.cshtml) + CSharpCode - (515:29,50 [7] NoLinePragmas.cshtml) RazorIRToken - (515:29,50 [7] NoLinePragmas.cshtml) - CSharp - \n}\n\n - CSharpStatement - (556:32,34 [0] NoLinePragmas.cshtml) + CSharpCode - (556:32,34 [0] NoLinePragmas.cshtml) RazorIRToken - (556:32,34 [0] NoLinePragmas.cshtml) - CSharp - HtmlContent - (556:32,34 [14] NoLinePragmas.cshtml) RazorIRToken - (556:32,34 [2] NoLinePragmas.cshtml) - Html - \n @@ -90,11 +90,11 @@ Document - HtmlContent - (572:33,14 [8] NoLinePragmas.cshtml) RazorIRToken - (572:33,14 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (576:33,18 [4] NoLinePragmas.cshtml) - Html - \n\n - CSharpStatement - (581:35,1 [26] NoLinePragmas.cshtml) + CSharpCode - (581:35,1 [26] NoLinePragmas.cshtml) RazorIRToken - (581:35,1 [26] NoLinePragmas.cshtml) - CSharp - lock(new object()) {\n HtmlContent - (607:36,4 [47] NoLinePragmas.cshtml) RazorIRToken - (607:36,4 [3] NoLinePragmas.cshtml) - Html -

RazorIRToken - (610:36,7 [40] NoLinePragmas.cshtml) - Html - This block is locked, for your security! RazorIRToken - (650:36,47 [4] NoLinePragmas.cshtml) - Html -

- CSharpStatement - (654:36,51 [3] NoLinePragmas.cshtml) + CSharpCode - (654:36,51 [3] NoLinePragmas.cshtml) RazorIRToken - (654:36,51 [3] NoLinePragmas.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt index 2bc28f2c10..4a04169d7b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt @@ -3,11 +3,11 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [18] NoLinePragmas.cshtml) + CSharpCode - (2:0,2 [18] NoLinePragmas.cshtml) RazorIRToken - (2:0,2 [18] NoLinePragmas.cshtml) - CSharp - \n int i = 1;\n HtmlContent - (23:3,0 [2] NoLinePragmas.cshtml) RazorIRToken - (23:3,0 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (26:4,1 [18] NoLinePragmas.cshtml) + CSharpCode - (26:4,1 [18] NoLinePragmas.cshtml) RazorIRToken - (26:4,1 [18] NoLinePragmas.cshtml) - CSharp - while(i <= 10) {\n HtmlContent - (44:5,0 [23] NoLinePragmas.cshtml) RazorIRToken - (44:5,0 [4] NoLinePragmas.cshtml) - Html - @@ -18,11 +18,11 @@ Document - HtmlContent - (71:5,27 [6] NoLinePragmas.cshtml) RazorIRToken - (71:5,27 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (75:5,31 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (77:6,0 [16] NoLinePragmas.cshtml) + CSharpCode - (77:6,0 [16] NoLinePragmas.cshtml) RazorIRToken - (77:6,0 [16] NoLinePragmas.cshtml) - CSharp - i += 1;\n}\n HtmlContent - (93:8,0 [2] NoLinePragmas.cshtml) RazorIRToken - (93:8,0 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (96:9,1 [15] NoLinePragmas.cshtml) + CSharpCode - (96:9,1 [15] NoLinePragmas.cshtml) RazorIRToken - (96:9,1 [15] NoLinePragmas.cshtml) - CSharp - if(i == 11) {\n HtmlContent - (111:10,0 [31] NoLinePragmas.cshtml) RazorIRToken - (111:10,0 [4] NoLinePragmas.cshtml) - Html - @@ -30,11 +30,11 @@ Document - RazorIRToken - (118:10,7 [18] NoLinePragmas.cshtml) - Html - We wrote 10 lines! RazorIRToken - (136:10,25 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (140:10,29 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (142:11,0 [3] NoLinePragmas.cshtml) + CSharpCode - (142:11,0 [3] NoLinePragmas.cshtml) RazorIRToken - (142:11,0 [3] NoLinePragmas.cshtml) - CSharp - }\n HtmlContent - (145:12,0 [2] NoLinePragmas.cshtml) RazorIRToken - (145:12,0 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (148:13,1 [27] NoLinePragmas.cshtml) + CSharpCode - (148:13,1 [27] NoLinePragmas.cshtml) RazorIRToken - (148:13,1 [27] NoLinePragmas.cshtml) - CSharp - switch(i) {\n case 11:\n HtmlContent - (175:15,0 [46] NoLinePragmas.cshtml) RazorIRToken - (175:15,0 [8] NoLinePragmas.cshtml) - Html - @@ -42,7 +42,7 @@ Document - RazorIRToken - (186:15,11 [29] NoLinePragmas.cshtml) - Html - No really, we wrote 10 lines! RazorIRToken - (215:15,40 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (219:15,44 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (221:16,0 [30] NoLinePragmas.cshtml) + CSharpCode - (221:16,0 [30] NoLinePragmas.cshtml) RazorIRToken - (221:16,0 [30] NoLinePragmas.cshtml) - CSharp - break;\n default:\n HtmlContent - (251:18,0 [39] NoLinePragmas.cshtml) RazorIRToken - (251:18,0 [8] NoLinePragmas.cshtml) - Html - @@ -50,11 +50,11 @@ Document - RazorIRToken - (262:18,11 [22] NoLinePragmas.cshtml) - Html - Actually, we didn't... RazorIRToken - (284:18,33 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (288:18,37 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (290:19,0 [19] NoLinePragmas.cshtml) + CSharpCode - (290:19,0 [19] NoLinePragmas.cshtml) RazorIRToken - (290:19,0 [19] NoLinePragmas.cshtml) - CSharp - break;\n}\n HtmlContent - (309:21,0 [2] NoLinePragmas.cshtml) RazorIRToken - (309:21,0 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (312:22,1 [35] NoLinePragmas.cshtml) + CSharpCode - (312:22,1 [35] NoLinePragmas.cshtml) RazorIRToken - (312:22,1 [35] NoLinePragmas.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n HtmlContent - (347:23,0 [29] NoLinePragmas.cshtml) RazorIRToken - (347:23,0 [4] NoLinePragmas.cshtml) - Html - @@ -65,11 +65,11 @@ Document - HtmlContent - (380:23,33 [6] NoLinePragmas.cshtml) RazorIRToken - (380:23,33 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (384:23,37 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (386:24,0 [3] NoLinePragmas.cshtml) + CSharpCode - (386:24,0 [3] NoLinePragmas.cshtml) RazorIRToken - (386:24,0 [3] NoLinePragmas.cshtml) - CSharp - }\n HtmlContent - (389:25,0 [2] NoLinePragmas.cshtml) RazorIRToken - (389:25,0 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (392:26,1 [7] NoLinePragmas.cshtml) + CSharpCode - (392:26,1 [7] NoLinePragmas.cshtml) RazorIRToken - (392:26,1 [7] NoLinePragmas.cshtml) - CSharp - try {\n HtmlContent - (399:27,0 [41] NoLinePragmas.cshtml) RazorIRToken - (399:27,0 [4] NoLinePragmas.cshtml) - Html - @@ -77,7 +77,7 @@ Document - RazorIRToken - (406:27,7 [28] NoLinePragmas.cshtml) - Html - That time, we wrote 5 lines! RazorIRToken - (434:27,35 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (438:27,39 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (440:28,0 [25] NoLinePragmas.cshtml) + CSharpCode - (440:28,0 [25] NoLinePragmas.cshtml) RazorIRToken - (440:28,0 [25] NoLinePragmas.cshtml) - CSharp - } catch(Exception ex) {\n HtmlContent - (465:29,0 [33] NoLinePragmas.cshtml) RazorIRToken - (465:29,0 [4] NoLinePragmas.cshtml) - Html - @@ -88,9 +88,9 @@ Document - HtmlContent - (511:29,46 [6] NoLinePragmas.cshtml) RazorIRToken - (511:29,46 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (515:29,50 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (517:30,0 [5] NoLinePragmas.cshtml) + CSharpCode - (517:30,0 [5] NoLinePragmas.cshtml) RazorIRToken - (517:30,0 [5] NoLinePragmas.cshtml) - CSharp - }\n\n - CSharpStatement - (556:32,34 [2] NoLinePragmas.cshtml) + CSharpCode - (556:32,34 [2] NoLinePragmas.cshtml) RazorIRToken - (556:32,34 [2] NoLinePragmas.cshtml) - CSharp - \n HtmlContent - (558:33,0 [12] NoLinePragmas.cshtml) RazorIRToken - (558:33,0 [3] NoLinePragmas.cshtml) - Html -

@@ -100,7 +100,7 @@ Document - HtmlContent - (572:33,14 [8] NoLinePragmas.cshtml) RazorIRToken - (572:33,14 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (576:33,18 [4] NoLinePragmas.cshtml) - Html - \n\n - CSharpStatement - (581:35,1 [22] NoLinePragmas.cshtml) + CSharpCode - (581:35,1 [22] NoLinePragmas.cshtml) RazorIRToken - (581:35,1 [22] NoLinePragmas.cshtml) - CSharp - lock(new object()) {\n HtmlContent - (603:36,0 [53] NoLinePragmas.cshtml) RazorIRToken - (603:36,0 [4] NoLinePragmas.cshtml) - Html - @@ -108,5 +108,5 @@ Document - RazorIRToken - (610:36,7 [40] NoLinePragmas.cshtml) - Html - This block is locked, for your security! RazorIRToken - (650:36,47 [4] NoLinePragmas.cshtml) - Html -

RazorIRToken - (654:36,51 [2] NoLinePragmas.cshtml) - Html - \n - CSharpStatement - (656:37,0 [1] NoLinePragmas.cshtml) + CSharpCode - (656:37,0 [1] NoLinePragmas.cshtml) RazorIRToken - (656:37,0 [1] NoLinePragmas.cshtml) - CSharp - } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt index 975f7d0cb8..baae2fab74 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt @@ -3,26 +3,26 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] NullConditionalExpressions.cshtml) + CSharpCode - (2:0,2 [6] NullConditionalExpressions.cshtml) RazorIRToken - (2:0,2 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (9:1,5 [13] NullConditionalExpressions.cshtml) RazorIRToken - (9:1,5 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data - CSharpStatement - (22:1,18 [6] NullConditionalExpressions.cshtml) + CSharpCode - (22:1,18 [6] NullConditionalExpressions.cshtml) RazorIRToken - (22:1,18 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (29:2,5 [22] NullConditionalExpressions.cshtml) RazorIRToken - (29:2,5 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0] - CSharpStatement - (51:2,27 [6] NullConditionalExpressions.cshtml) + CSharpCode - (51:2,27 [6] NullConditionalExpressions.cshtml) RazorIRToken - (51:2,27 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (58:3,5 [26] NullConditionalExpressions.cshtml) RazorIRToken - (58:3,5 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"] - CSharpStatement - (84:3,31 [6] NullConditionalExpressions.cshtml) + CSharpCode - (84:3,31 [6] NullConditionalExpressions.cshtml) RazorIRToken - (84:3,31 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (91:4,5 [41] NullConditionalExpressions.cshtml) RazorIRToken - (91:4,5 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"] - CSharpStatement - (132:4,46 [2] NullConditionalExpressions.cshtml) + CSharpCode - (132:4,46 [2] NullConditionalExpressions.cshtml) RazorIRToken - (132:4,46 [2] NullConditionalExpressions.cshtml) - CSharp - \n HtmlContent - (137:6,0 [2] NullConditionalExpressions.cshtml) RazorIRToken - (137:6,0 [2] NullConditionalExpressions.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt index 4b671b7917..18cae6667f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt @@ -3,23 +3,23 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [6] NullConditionalExpressions.cshtml) + CSharpCode - (2:0,2 [6] NullConditionalExpressions.cshtml) RazorIRToken - (2:0,2 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (9:1,5 [13] NullConditionalExpressions.cshtml) RazorIRToken - (9:1,5 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data - CSharpStatement - (22:1,18 [6] NullConditionalExpressions.cshtml) + CSharpCode - (22:1,18 [6] NullConditionalExpressions.cshtml) RazorIRToken - (22:1,18 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (29:2,5 [22] NullConditionalExpressions.cshtml) RazorIRToken - (29:2,5 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0] - CSharpStatement - (51:2,27 [6] NullConditionalExpressions.cshtml) + CSharpCode - (51:2,27 [6] NullConditionalExpressions.cshtml) RazorIRToken - (51:2,27 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (58:3,5 [26] NullConditionalExpressions.cshtml) RazorIRToken - (58:3,5 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"] - CSharpStatement - (84:3,31 [6] NullConditionalExpressions.cshtml) + CSharpCode - (84:3,31 [6] NullConditionalExpressions.cshtml) RazorIRToken - (84:3,31 [6] NullConditionalExpressions.cshtml) - CSharp - \n CSharpExpression - (91:4,5 [41] NullConditionalExpressions.cshtml) RazorIRToken - (91:4,5 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"] - CSharpStatement - (132:4,46 [2] NullConditionalExpressions.cshtml) + CSharpCode - (132:4,46 [2] NullConditionalExpressions.cshtml) RazorIRToken - (132:4,46 [2] NullConditionalExpressions.cshtml) - CSharp - \n HtmlContent - (137:6,0 [2] NullConditionalExpressions.cshtml) RazorIRToken - (137:6,0 [2] NullConditionalExpressions.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt index 063e9ad9ba..692ced2a5f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [16] OpenedIf.cshtml) @@ -11,13 +11,13 @@ Document - RazorIRToken - (6:0,6 [2] OpenedIf.cshtml) - Html - \n RazorIRToken - (8:1,0 [6] OpenedIf.cshtml) - Html - RazorIRToken - (14:1,6 [2] OpenedIf.cshtml) - Html - \n - CSharpStatement - (17:2,1 [14] OpenedIf.cshtml) + CSharpCode - (17:2,1 [14] OpenedIf.cshtml) RazorIRToken - (17:2,1 [14] OpenedIf.cshtml) - CSharp - if (true) { \n HtmlContent - (31:3,0 [7] OpenedIf.cshtml) RazorIRToken - (31:3,0 [7] OpenedIf.cshtml) - Html - - CSharpStatement - (38:3,7 [2] OpenedIf.cshtml) + CSharpCode - (38:3,7 [2] OpenedIf.cshtml) RazorIRToken - (38:3,7 [2] OpenedIf.cshtml) - CSharp - \n HtmlContent - (40:4,0 [7] OpenedIf.cshtml) RazorIRToken - (40:4,0 [7] OpenedIf.cshtml) - Html - - CSharpStatement - (47:4,7 [0] OpenedIf.cshtml) + CSharpCode - (47:4,7 [0] OpenedIf.cshtml) RazorIRToken - (47:4,7 [0] OpenedIf.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt index 6ae91e0ef5..c973cd4b75 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt @@ -8,11 +8,11 @@ Document - RazorIRToken - (6:0,6 [2] OpenedIf.cshtml) - Html - \n RazorIRToken - (8:1,0 [6] OpenedIf.cshtml) - Html - RazorIRToken - (14:1,6 [2] OpenedIf.cshtml) - Html - \n - CSharpStatement - (17:2,1 [14] OpenedIf.cshtml) + CSharpCode - (17:2,1 [14] OpenedIf.cshtml) RazorIRToken - (17:2,1 [14] OpenedIf.cshtml) - CSharp - if (true) { \n HtmlContent - (31:3,0 [16] OpenedIf.cshtml) RazorIRToken - (31:3,0 [7] OpenedIf.cshtml) - Html - RazorIRToken - (38:3,7 [2] OpenedIf.cshtml) - Html - \n RazorIRToken - (40:4,0 [7] OpenedIf.cshtml) - Html - - CSharpStatement - (47:4,7 [0] OpenedIf.cshtml) + CSharpCode - (47:4,7 [0] OpenedIf.cshtml) RazorIRToken - (47:4,7 [0] OpenedIf.cshtml) - CSharp - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt index ab8ded44cf..9ea83b0bfe 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt @@ -3,8 +3,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [31] ParserError.cshtml) + CSharpCode - (2:0,2 [31] ParserError.cshtml) RazorIRToken - (2:0,2 [31] ParserError.cshtml) - CSharp - \n/*\nint i =10;\nint j =20;\n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt index 040796ec3c..8f38f1f937 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt @@ -3,5 +3,5 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [31] ParserError.cshtml) + CSharpCode - (2:0,2 [31] ParserError.cshtml) RazorIRToken - (2:0,2 [31] ParserError.cshtml) - CSharp - \n/*\nint i =10;\nint j =20;\n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt index c48ffd381c..dc10c0b577 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt @@ -4,13 +4,13 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] PrefixedAttributeTagHelpers.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.InputTagHelper1 - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:0,31 [4] PrefixedAttributeTagHelpers.cshtml) RazorIRToken - (31:0,31 [4] PrefixedAttributeTagHelpers.cshtml) - Html - \n\n - CSharpStatement - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) + CSharpCode - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) RazorIRToken - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - CSharp - \n var literate = "or illiterate";\n var intDictionary = new Dictionary\n {\n { "three", 3 },\n };\n var stringDictionary = new SortedDictionary\n {\n { "name", "value" },\n };\n HtmlContent - (282:13,0 [49] PrefixedAttributeTagHelpers.cshtml) RazorIRToken - (282:13,0 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt index 32bbe82e0c..aff82949f8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt @@ -13,7 +13,7 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] PrefixedAttributeTagHelpers.cshtml) RazorIRToken - (33:1,0 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n - CSharpStatement - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) + CSharpCode - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) RazorIRToken - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - CSharp - \n var literate = "or illiterate";\n var intDictionary = new Dictionary\n {\n { "three", 3 },\n };\n var stringDictionary = new SortedDictionary\n {\n { "name", "value" },\n };\n HtmlContent - (282:13,0 [49] PrefixedAttributeTagHelpers.cshtml) RazorIRToken - (282:13,0 [2] PrefixedAttributeTagHelpers.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt index cb3dfae7f2..da51d82b52 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt @@ -3,7 +3,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (36:0,36 [17] RazorComments.cshtml) @@ -14,15 +14,15 @@ Document - RazorIRToken - (62:1,24 [9] RazorComments.cshtml) - Html - be shown RazorIRToken - (71:1,33 [4] RazorComments.cshtml) - Html -

RazorIRToken - (75:1,37 [4] RazorComments.cshtml) - Html - \n\n - CSharpStatement - (81:3,2 [6] RazorComments.cshtml) + CSharpCode - (81:3,2 [6] RazorComments.cshtml) RazorIRToken - (81:3,2 [6] RazorComments.cshtml) - CSharp - \n - CSharpStatement - (122:4,39 [22] RazorComments.cshtml) + CSharpCode - (122:4,39 [22] RazorComments.cshtml) RazorIRToken - (122:4,39 [22] RazorComments.cshtml) - CSharp - \n Exception foo = - CSharpStatement - (173:5,49 [58] RazorComments.cshtml) + CSharpCode - (173:5,49 [58] RazorComments.cshtml) RazorIRToken - (173:5,49 [58] RazorComments.cshtml) - CSharp - null;\n if(foo != null) {\n throw foo;\n }\n HtmlContent - (234:10,0 [2] RazorComments.cshtml) RazorIRToken - (234:10,0 [2] RazorComments.cshtml) - Html - \n - CSharpStatement - (238:11,2 [24] RazorComments.cshtml) + CSharpCode - (238:11,2 [24] RazorComments.cshtml) RazorIRToken - (238:11,2 [24] RazorComments.cshtml) - CSharp - var bar = "@* bar *@"; HtmlContent - (265:12,0 [44] RazorComments.cshtml) RazorIRToken - (265:12,0 [3] RazorComments.cshtml) - Html -

diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt index 81494d20f4..73c707ecf1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt @@ -11,15 +11,15 @@ Document - RazorIRToken - (62:1,24 [9] RazorComments.cshtml) - Html - be shown RazorIRToken - (71:1,33 [4] RazorComments.cshtml) - Html -

RazorIRToken - (75:1,37 [4] RazorComments.cshtml) - Html - \n\n - CSharpStatement - (81:3,2 [6] RazorComments.cshtml) + CSharpCode - (81:3,2 [6] RazorComments.cshtml) RazorIRToken - (81:3,2 [6] RazorComments.cshtml) - CSharp - \n - CSharpStatement - (122:4,39 [22] RazorComments.cshtml) + CSharpCode - (122:4,39 [22] RazorComments.cshtml) RazorIRToken - (122:4,39 [22] RazorComments.cshtml) - CSharp - \n Exception foo = - CSharpStatement - (173:5,49 [58] RazorComments.cshtml) + CSharpCode - (173:5,49 [58] RazorComments.cshtml) RazorIRToken - (173:5,49 [58] RazorComments.cshtml) - CSharp - null;\n if(foo != null) {\n throw foo;\n }\n HtmlContent - (234:10,0 [2] RazorComments.cshtml) RazorIRToken - (234:10,0 [2] RazorComments.cshtml) - Html - \n - CSharpStatement - (238:11,2 [24] RazorComments.cshtml) + CSharpCode - (238:11,2 [24] RazorComments.cshtml) RazorIRToken - (238:11,2 [24] RazorComments.cshtml) - CSharp - var bar = "@* bar *@"; HtmlContent - (265:12,0 [44] RazorComments.cshtml) RazorIRToken - (265:12,0 [3] RazorComments.cshtml) - Html -

diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt index 418cd3d184..92a710b296 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RemoveTagHelperDirective_DesignTime - - DesignTimeDirective - DirectiveToken - (17:0,17 [15] RemoveTagHelperDirective.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (32:0,32 [2] RemoveTagHelperDirective.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt index d5b1685bd5..02db538cdc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt @@ -6,16 +6,16 @@ Document - DirectiveToken - (89:6,9 [8] Sections.cshtml) - Section2 DirectiveToken - (172:10,9 [8] Sections.cshtml) - Section1 DirectiveToken - (235:14,9 [15] Sections.cshtml) - NestedDelegates - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [44] Sections.cshtml) + CSharpCode - (2:0,2 [44] Sections.cshtml) RazorIRToken - (2:0,2 [44] Sections.cshtml) - CSharp - \n Layout = "_SectionTestLayout.cshtml"\n HtmlContent - (49:3,0 [31] Sections.cshtml) RazorIRToken - (49:3,0 [2] Sections.cshtml) - Html - \n RazorIRToken - (51:4,0 [5] Sections.cshtml) - Html -

RazorIRToken - (56:4,5 [24] Sections.cshtml) - Html - This is in the Body>\n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("Section2", async (__razor_section_writer) => { HtmlContent - (99:6,19 [10] Sections.cshtml) RazorIRToken - (99:6,19 [6] Sections.cshtml) - Html - \n @@ -30,11 +30,11 @@ Document - RazorIRToken - (130:7,29 [20] Sections.cshtml) - Html - This is in Section 2 RazorIRToken - (150:7,49 [6] Sections.cshtml) - Html -
RazorIRToken - (156:7,55 [2] Sections.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (159:8,1 [4] Sections.cshtml) RazorIRToken - (159:8,1 [4] Sections.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("Section1", async (__razor_section_writer) => { HtmlContent - (182:10,19 [39] Sections.cshtml) RazorIRToken - (182:10,19 [6] Sections.cshtml) - Html - \n @@ -42,15 +42,15 @@ Document - RazorIRToken - (193:11,9 [20] Sections.cshtml) - Html - This is in Section 1 RazorIRToken - (213:11,29 [6] Sections.cshtml) - Html - RazorIRToken - (219:11,35 [2] Sections.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (222:12,1 [4] Sections.cshtml) RazorIRToken - (222:12,1 [4] Sections.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("NestedDelegates", async (__razor_section_writer) => { HtmlContent - (252:14,26 [6] Sections.cshtml) RazorIRToken - (252:14,26 [6] Sections.cshtml) - Html - \n - CSharpStatement - (260:15,6 [27] Sections.cshtml) + CSharpCode - (260:15,6 [27] Sections.cshtml) RazorIRToken - (260:15,6 [27] Sections.cshtml) - CSharp - Func f = Template - (288:15,34 [17] Sections.cshtml) HtmlContent - (288:15,34 [6] Sections.cshtml) @@ -59,7 +59,7 @@ Document - RazorIRToken - (295:15,41 [4] Sections.cshtml) - CSharp - item HtmlContent - (299:15,45 [7] Sections.cshtml) RazorIRToken - (299:15,45 [7] Sections.cshtml) - Html - - CSharpStatement - (306:15,52 [2] Sections.cshtml) + CSharpCode - (306:15,52 [2] Sections.cshtml) RazorIRToken - (306:15,52 [2] Sections.cshtml) - CSharp - ; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt index 02741fac94..9676c307c4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt @@ -3,13 +3,13 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [44] Sections.cshtml) + CSharpCode - (2:0,2 [44] Sections.cshtml) RazorIRToken - (2:0,2 [44] Sections.cshtml) - CSharp - \n Layout = "_SectionTestLayout.cshtml"\n HtmlContent - (49:3,0 [31] Sections.cshtml) RazorIRToken - (49:3,0 [2] Sections.cshtml) - Html - \n RazorIRToken - (51:4,0 [5] Sections.cshtml) - Html -
RazorIRToken - (56:4,5 [24] Sections.cshtml) - Html - This is in the Body>\n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("Section2", async () => { HtmlContent - (99:6,19 [10] Sections.cshtml) RazorIRToken - (99:6,19 [6] Sections.cshtml) - Html - \n @@ -24,11 +24,11 @@ Document - RazorIRToken - (130:7,29 [20] Sections.cshtml) - Html - This is in Section 2 RazorIRToken - (150:7,49 [6] Sections.cshtml) - Html -
RazorIRToken - (156:7,55 [2] Sections.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (161:9,0 [2] Sections.cshtml) RazorIRToken - (161:9,0 [2] Sections.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("Section1", async () => { HtmlContent - (182:10,19 [39] Sections.cshtml) RazorIRToken - (182:10,19 [6] Sections.cshtml) - Html - \n @@ -36,17 +36,17 @@ Document - RazorIRToken - (193:11,9 [20] Sections.cshtml) - Html - This is in Section 1 RazorIRToken - (213:11,29 [6] Sections.cshtml) - Html - RazorIRToken - (219:11,35 [2] Sections.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (224:13,0 [2] Sections.cshtml) RazorIRToken - (224:13,0 [2] Sections.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("NestedDelegates", async () => { HtmlContent - (252:14,26 [2] Sections.cshtml) RazorIRToken - (252:14,26 [2] Sections.cshtml) - Html - \n - CSharpStatement - (254:15,0 [4] Sections.cshtml) + CSharpCode - (254:15,0 [4] Sections.cshtml) RazorIRToken - (254:15,0 [4] Sections.cshtml) - CSharp - - CSharpStatement - (260:15,6 [27] Sections.cshtml) + CSharpCode - (260:15,6 [27] Sections.cshtml) RazorIRToken - (260:15,6 [27] Sections.cshtml) - CSharp - Func f = Template - (288:15,34 [17] Sections.cshtml) HtmlContent - (288:15,34 [6] Sections.cshtml) @@ -55,7 +55,7 @@ Document - RazorIRToken - (295:15,41 [4] Sections.cshtml) - CSharp - item HtmlContent - (299:15,45 [7] Sections.cshtml) RazorIRToken - (299:15,45 [7] Sections.cshtml) - Html - - CSharpStatement - (306:15,52 [2] Sections.cshtml) + CSharpCode - (306:15,52 [2] Sections.cshtml) RazorIRToken - (306:15,52 [2] Sections.cshtml) - CSharp - ; - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt index 3d383b4262..cff16b8bc5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] SimpleTagHelpers.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt index f8c0d6447f..6ff09f281b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt @@ -3,13 +3,13 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (1:0,1 [15] SimpleUnspacedIf.cshtml) + CSharpCode - (1:0,1 [15] SimpleUnspacedIf.cshtml) RazorIRToken - (1:0,1 [15] SimpleUnspacedIf.cshtml) - CSharp - if (true)\n{\n HtmlContent - (16:2,1 [11] SimpleUnspacedIf.cshtml) RazorIRToken - (16:2,1 [5] SimpleUnspacedIf.cshtml) - Html -
RazorIRToken - (21:2,6 [6] SimpleUnspacedIf.cshtml) - Html -
- CSharpStatement - (27:2,12 [3] SimpleUnspacedIf.cshtml) + CSharpCode - (27:2,12 [3] SimpleUnspacedIf.cshtml) RazorIRToken - (27:2,12 [3] SimpleUnspacedIf.cshtml) - CSharp - \n} diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt index db97bb1944..bb47a6936b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt @@ -3,12 +3,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (1:0,1 [14] SimpleUnspacedIf.cshtml) + CSharpCode - (1:0,1 [14] SimpleUnspacedIf.cshtml) RazorIRToken - (1:0,1 [14] SimpleUnspacedIf.cshtml) - CSharp - if (true)\n{\n HtmlContent - (15:2,0 [14] SimpleUnspacedIf.cshtml) RazorIRToken - (15:2,0 [1] SimpleUnspacedIf.cshtml) - Html - RazorIRToken - (16:2,1 [5] SimpleUnspacedIf.cshtml) - Html -
RazorIRToken - (21:2,6 [6] SimpleUnspacedIf.cshtml) - Html -
RazorIRToken - (27:2,12 [2] SimpleUnspacedIf.cshtml) - Html - \n - CSharpStatement - (29:3,0 [1] SimpleUnspacedIf.cshtml) + CSharpCode - (29:3,0 [1] SimpleUnspacedIf.cshtml) RazorIRToken - (29:3,0 [1] SimpleUnspacedIf.cshtml) - CSharp - } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt index f7bfb57640..9f9efca08f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt index 9886c8b914..8a983cbb58 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] SingleTagHelper.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt index adc711d50e..febee833ec 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt @@ -5,7 +5,7 @@ Document - DesignTimeDirective - DirectiveToken - (2022:85,9 [21] StringLiterals.cshtml) - WriteLiteralsToInHere DirectiveToken - (5701:205,9 [25] StringLiterals.cshtml) - WriteLiteralsToInHereAlso - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [2013] StringLiterals.cshtml) @@ -346,7 +346,7 @@ Document - RazorIRToken - (2001:83,18 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (2005:83,22 [4] StringLiterals.cshtml) - Html -
RazorIRToken - (2009:83,26 [4] StringLiterals.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("WriteLiteralsToInHere", async (__razor_section_writer) => { HtmlContent - (2045:85,32 [2618] StringLiterals.cshtml) RazorIRToken - (2045:85,32 [6] StringLiterals.cshtml) - Html - \n @@ -650,7 +650,7 @@ Document - RazorIRToken - (4635:160,7 [22] StringLiterals.cshtml) - Html - This is line 75 nested RazorIRToken - (4657:160,29 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (4661:160,33 [2] StringLiterals.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (4664:161,1 [1028] StringLiterals.cshtml) RazorIRToken - (4664:161,1 [2] StringLiterals.cshtml) - Html - \n @@ -826,7 +826,7 @@ Document - RazorIRToken - (5668:204,3 [15] StringLiterals.cshtml) - Html - This is line 43 RazorIRToken - (5683:204,18 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (5687:204,22 [5] StringLiterals.cshtml) - Html - hi!\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("WriteLiteralsToInHereAlso", async (__razor_section_writer) => { HtmlContent - (5728:205,36 [1023] StringLiterals.cshtml) RazorIRToken - (5728:205,36 [6] StringLiterals.cshtml) - Html - \n @@ -950,7 +950,7 @@ Document - RazorIRToken - (6743:235,7 [2] StringLiterals.cshtml) - Html - 30 RazorIRToken - (6745:235,9 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (6749:235,13 [2] StringLiterals.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (6752:236,1 [1] StringLiterals.cshtml) RazorIRToken - (6752:236,1 [1] StringLiterals.cshtml) - Html - ! diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt index ce3ce7f153..91382573d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt @@ -341,7 +341,7 @@ Document - RazorIRToken - (2001:83,18 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (2005:83,22 [4] StringLiterals.cshtml) - Html -
RazorIRToken - (2009:83,26 [4] StringLiterals.cshtml) - Html - \n\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("WriteLiteralsToInHere", async () => { HtmlContent - (2045:85,32 [2618] StringLiterals.cshtml) RazorIRToken - (2045:85,32 [6] StringLiterals.cshtml) - Html - \n @@ -645,7 +645,7 @@ Document - RazorIRToken - (4635:160,7 [22] StringLiterals.cshtml) - Html - This is line 75 nested RazorIRToken - (4657:160,29 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (4661:160,33 [2] StringLiterals.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (4666:162,0 [1026] StringLiterals.cshtml) RazorIRToken - (4666:162,0 [3] StringLiterals.cshtml) - Html -

@@ -820,7 +820,7 @@ Document - RazorIRToken - (5668:204,3 [15] StringLiterals.cshtml) - Html - This is line 43 RazorIRToken - (5683:204,18 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (5687:204,22 [5] StringLiterals.cshtml) - Html - hi!\n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("WriteLiteralsToInHereAlso", async () => { HtmlContent - (5728:205,36 [1023] StringLiterals.cshtml) RazorIRToken - (5728:205,36 [6] StringLiterals.cshtml) - Html - \n @@ -944,7 +944,7 @@ Document - RazorIRToken - (6743:235,7 [2] StringLiterals.cshtml) - Html - 30 RazorIRToken - (6745:235,9 [4] StringLiterals.cshtml) - Html -

RazorIRToken - (6749:235,13 [2] StringLiterals.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); HtmlContent - (6752:236,1 [1] StringLiterals.cshtml) RazorIRToken - (6752:236,1 [1] StringLiterals.cshtml) - Html - ! diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt index e46942d62b..9622a32c44 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] SymbolBoundAttributes.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.CatchAllTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt index ff9f75a5e3..09e2dc8542 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt @@ -6,11 +6,11 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] TagHelpersInSection.cshtml) RazorIRToken - (33:1,0 [2] TagHelpersInSection.cshtml) - Html - \n - CSharpStatement - (37:2,2 [31] TagHelpersInSection.cshtml) + CSharpCode - (37:2,2 [31] TagHelpersInSection.cshtml) RazorIRToken - (37:2,2 [31] TagHelpersInSection.cshtml) - CSharp - \n var code = "some code";\n HtmlContent - (71:5,0 [2] TagHelpersInSection.cshtml) RazorIRToken - (71:5,0 [2] TagHelpersInSection.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - DefineSection("MySection", async () => { HtmlContent - (93:6,20 [21] TagHelpersInSection.cshtml) RazorIRToken - (93:6,20 [6] TagHelpersInSection.cshtml) - Html - \n @@ -48,5 +48,5 @@ Document - RazorIRToken - (359:11,22 [6] TagHelpersInSection.cshtml) - Html - \n RazorIRToken - (365:12,4 [6] TagHelpersInSection.cshtml) - Html - RazorIRToken - (371:12,10 [2] TagHelpersInSection.cshtml) - Html - \n - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - }); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt index f381e13460..67f64f6d0d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [15] TagHelpersWithBoundAttributes.cshtml) - *, TestAssembly - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt index 61abc9a1b1..203c0a9474 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt @@ -5,7 +5,7 @@ Document - DesignTimeDirective - DirectiveToken - (14:0,14 [15] TagHelpersWithPrefix.cshtml) - *, TestAssembly DirectiveToken - (48:1,17 [5] TagHelpersWithPrefix.cshtml) - cool: - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt index 7209e93094..d5d91ae3a7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] TagHelpersWithTemplate.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - DivTagHelper - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync @@ -16,7 +16,7 @@ Document - TagHelperBody - HtmlContent - (325:11,5 [6] TagHelpersWithTemplate.cshtml) RazorIRToken - (325:11,5 [6] TagHelpersWithTemplate.cshtml) - Html - \n - CSharpStatement - (333:12,6 [66] TagHelpersWithTemplate.cshtml) + CSharpCode - (333:12,6 [66] TagHelpersWithTemplate.cshtml) RazorIRToken - (333:12,6 [66] TagHelpersWithTemplate.cshtml) - CSharp - \n RenderTemplate(\n "Template: ",\n Template - (400:15,13 [82] TagHelpersWithTemplate.cshtml) TagHelper - (400:15,13 [82] TagHelpersWithTemplate.cshtml) - div - TagMode.StartTagAndEndTag @@ -40,10 +40,10 @@ Document - AddTagHelperHtmlAttribute - - condition - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (416:15,29 [4] TagHelpersWithTemplate.cshtml) RazorIRToken - (416:15,29 [4] TagHelpersWithTemplate.cshtml) - Html - true - CSharpStatement - (482:15,95 [8] TagHelpersWithTemplate.cshtml) + CSharpCode - (482:15,95 [8] TagHelpersWithTemplate.cshtml) RazorIRToken - (482:15,95 [8] TagHelpersWithTemplate.cshtml) - CSharp - );\n CreateTagHelper - - DivTagHelper HtmlContent - (499:17,6 [4] TagHelpersWithTemplate.cshtml) RazorIRToken - (499:17,6 [4] TagHelpersWithTemplate.cshtml) - Html - \n\n - CSharpStatement - (47:2,12 [268] TagHelpersWithTemplate.cshtml) + CSharpCode - (47:2,12 [268] TagHelpersWithTemplate.cshtml) RazorIRToken - (47:2,12 [268] TagHelpersWithTemplate.cshtml) - CSharp - \n public void RenderTemplate(string title, Func template)\n {\n Output.WriteLine("

Rendering Template:

");\n var helperResult = template(title);\n helperResult.WriteTo(Output, HtmlEncoder);\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt index e4820b540a..63a6d716d5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt @@ -15,9 +15,9 @@ Document - TagHelperBody - HtmlContent - (325:11,5 [2] TagHelpersWithTemplate.cshtml) RazorIRToken - (325:11,5 [2] TagHelpersWithTemplate.cshtml) - Html - \n - CSharpStatement - (327:12,0 [4] TagHelpersWithTemplate.cshtml) + CSharpCode - (327:12,0 [4] TagHelpersWithTemplate.cshtml) RazorIRToken - (327:12,0 [4] TagHelpersWithTemplate.cshtml) - CSharp - - CSharpStatement - (333:12,6 [66] TagHelpersWithTemplate.cshtml) + CSharpCode - (333:12,6 [66] TagHelpersWithTemplate.cshtml) RazorIRToken - (333:12,6 [66] TagHelpersWithTemplate.cshtml) - CSharp - \n RenderTemplate(\n "Template: ",\n Template - (400:15,13 [82] TagHelpersWithTemplate.cshtml) TagHelper - (400:15,13 [82] TagHelpersWithTemplate.cshtml) - div - TagMode.StartTagAndEndTag @@ -35,10 +35,10 @@ Document - AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 CreateTagHelper - - DivTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - CSharpStatement - (482:15,95 [8] TagHelpersWithTemplate.cshtml) + CSharpCode - (482:15,95 [8] TagHelpersWithTemplate.cshtml) RazorIRToken - (482:15,95 [8] TagHelpersWithTemplate.cshtml) - CSharp - );\n CreateTagHelper - - DivTagHelper HtmlContent - (499:17,6 [4] TagHelpersWithTemplate.cshtml) RazorIRToken - (499:17,6 [4] TagHelpersWithTemplate.cshtml) - Html - \n\n - CSharpStatement - (47:2,12 [268] TagHelpersWithTemplate.cshtml) + CSharpCode - (47:2,12 [268] TagHelpersWithTemplate.cshtml) RazorIRToken - (47:2,12 [268] TagHelpersWithTemplate.cshtml) - CSharp - \n public void RenderTemplate(string title, Func template)\n {\n Output.WriteLine("

Rendering Template:

");\n var helperResult = template(title);\n helperResult.WriteTo(Output, HtmlEncoder);\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt index 916bcd95a0..0b6d78075e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt @@ -4,7 +4,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] TagHelpersWithWeirdlySpacedAttributes.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt index cfb3c38a80..49516df3b7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt @@ -3,12 +3,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (278:8,1 [4] Templates.cshtml) RazorIRToken - (278:8,1 [4] Templates.cshtml) - Html - \n\n - CSharpStatement - (284:10,2 [34] Templates.cshtml) + CSharpCode - (284:10,2 [34] Templates.cshtml) RazorIRToken - (284:10,2 [34] Templates.cshtml) - CSharp - \n Func foo = Template - (325:11,39 [16] Templates.cshtml) HtmlContent - (325:11,39 [11] Templates.cshtml) @@ -17,15 +17,15 @@ Document - RazorIRToken - (337:11,51 [4] Templates.cshtml) - CSharp - item HtmlContent - (341:11,55 [1] Templates.cshtml) RazorIRToken - (341:11,55 [1] Templates.cshtml) - Html - ! - CSharpStatement - (349:11,63 [7] Templates.cshtml) + CSharpCode - (349:11,63 [7] Templates.cshtml) RazorIRToken - (349:11,63 [7] Templates.cshtml) - CSharp - ;\n CSharpExpression - (357:12,5 [7] Templates.cshtml) RazorIRToken - (357:12,5 [7] Templates.cshtml) - CSharp - foo("") - CSharpStatement - (364:12,12 [2] Templates.cshtml) + CSharpCode - (364:12,12 [2] Templates.cshtml) RazorIRToken - (364:12,12 [2] Templates.cshtml) - CSharp - \n HtmlContent - (369:14,0 [2] Templates.cshtml) RazorIRToken - (369:14,0 [2] Templates.cshtml) - Html - \n - CSharpStatement - (373:15,2 [35] Templates.cshtml) + CSharpCode - (373:15,2 [35] Templates.cshtml) RazorIRToken - (373:15,2 [35] Templates.cshtml) - CSharp - \n Func bar = Template - (409:16,33 [26] Templates.cshtml) HtmlContent - (409:16,33 [2] Templates.cshtml) @@ -37,11 +37,11 @@ Document - RazorIRToken - (425:16,49 [1] Templates.cshtml) - Html - > RazorIRToken - (426:16,50 [5] Templates.cshtml) - Html - Hello RazorIRToken - (431:16,55 [4] Templates.cshtml) - Html -

- CSharpStatement - (435:16,59 [7] Templates.cshtml) + CSharpCode - (435:16,59 [7] Templates.cshtml) RazorIRToken - (435:16,59 [7] Templates.cshtml) - CSharp - ;\n CSharpExpression - (443:17,5 [14] Templates.cshtml) RazorIRToken - (443:17,5 [14] Templates.cshtml) - CSharp - bar("myclass") - CSharpStatement - (457:17,19 [2] Templates.cshtml) + CSharpCode - (457:17,19 [2] Templates.cshtml) RazorIRToken - (457:17,19 [2] Templates.cshtml) - CSharp - \n HtmlContent - (462:19,0 [8] Templates.cshtml) RazorIRToken - (462:19,0 [2] Templates.cshtml) - Html - \n @@ -122,7 +122,7 @@ Document - RazorIRToken - (781:45,15 [4] Templates.cshtml) - CSharp - item HtmlContent - (785:45,19 [10] Templates.cshtml) RazorIRToken - (785:45,19 [10] Templates.cshtml) - Html - \n - CSharpStatement - (797:46,10 [18] Templates.cshtml) + CSharpCode - (797:46,10 [18] Templates.cshtml) RazorIRToken - (797:46,10 [18] Templates.cshtml) - CSharp - var parent = item; HtmlContent - (818:47,0 [53] Templates.cshtml) RazorIRToken - (818:47,0 [8] Templates.cshtml) - Html - @@ -142,5 +142,5 @@ Document - RazorIRToken - (957:51,10 [2] Templates.cshtml) - Html - \n RazorIRToken - (959:52,0 [5] Templates.cshtml) - Html - RazorIRToken - (964:52,5 [1] Templates.cshtml) - Html - - CSharpStatement - (12:0,12 [265] Templates.cshtml) + CSharpCode - (12:0,12 [265] Templates.cshtml) RazorIRToken - (12:0,12 [265] Templates.cshtml) - CSharp - \n public HelperResult Repeat(int times, Func template) {\n return new HelperResult((writer) => {\n for(int i = 0; i < times; i++) {\n ((HelperResult)template(i)).WriteTo(writer);\n }\n });\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt index fd5c9c3efe..a743a66570 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt @@ -5,7 +5,7 @@ Document - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (280:9,0 [2] Templates.cshtml) RazorIRToken - (280:9,0 [2] Templates.cshtml) - Html - \n - CSharpStatement - (284:10,2 [34] Templates.cshtml) + CSharpCode - (284:10,2 [34] Templates.cshtml) RazorIRToken - (284:10,2 [34] Templates.cshtml) - CSharp - \n Func foo = Template - (325:11,39 [16] Templates.cshtml) HtmlContent - (325:11,39 [11] Templates.cshtml) @@ -14,15 +14,15 @@ Document - RazorIRToken - (337:11,51 [4] Templates.cshtml) - CSharp - item HtmlContent - (341:11,55 [1] Templates.cshtml) RazorIRToken - (341:11,55 [1] Templates.cshtml) - Html - ! - CSharpStatement - (349:11,63 [7] Templates.cshtml) + CSharpCode - (349:11,63 [7] Templates.cshtml) RazorIRToken - (349:11,63 [7] Templates.cshtml) - CSharp - ;\n CSharpExpression - (357:12,5 [7] Templates.cshtml) RazorIRToken - (357:12,5 [7] Templates.cshtml) - CSharp - foo("") - CSharpStatement - (364:12,12 [2] Templates.cshtml) + CSharpCode - (364:12,12 [2] Templates.cshtml) RazorIRToken - (364:12,12 [2] Templates.cshtml) - CSharp - \n HtmlContent - (369:14,0 [2] Templates.cshtml) RazorIRToken - (369:14,0 [2] Templates.cshtml) - Html - \n - CSharpStatement - (373:15,2 [35] Templates.cshtml) + CSharpCode - (373:15,2 [35] Templates.cshtml) RazorIRToken - (373:15,2 [35] Templates.cshtml) - CSharp - \n Func bar = Template - (409:16,33 [26] Templates.cshtml) HtmlContent - (409:16,33 [2] Templates.cshtml) @@ -34,11 +34,11 @@ Document - RazorIRToken - (425:16,49 [1] Templates.cshtml) - Html - > RazorIRToken - (426:16,50 [5] Templates.cshtml) - Html - Hello RazorIRToken - (431:16,55 [4] Templates.cshtml) - Html -

- CSharpStatement - (435:16,59 [7] Templates.cshtml) + CSharpCode - (435:16,59 [7] Templates.cshtml) RazorIRToken - (435:16,59 [7] Templates.cshtml) - CSharp - ;\n CSharpExpression - (443:17,5 [14] Templates.cshtml) RazorIRToken - (443:17,5 [14] Templates.cshtml) - CSharp - bar("myclass") - CSharpStatement - (457:17,19 [2] Templates.cshtml) + CSharpCode - (457:17,19 [2] Templates.cshtml) RazorIRToken - (457:17,19 [2] Templates.cshtml) - CSharp - \n HtmlContent - (462:19,0 [8] Templates.cshtml) RazorIRToken - (462:19,0 [2] Templates.cshtml) - Html - \n @@ -120,9 +120,9 @@ Document - RazorIRToken - (781:45,15 [4] Templates.cshtml) - CSharp - item HtmlContent - (785:45,19 [2] Templates.cshtml) RazorIRToken - (785:45,19 [2] Templates.cshtml) - Html - \n - CSharpStatement - (787:46,0 [8] Templates.cshtml) + CSharpCode - (787:46,0 [8] Templates.cshtml) RazorIRToken - (787:46,0 [8] Templates.cshtml) - CSharp - - CSharpStatement - (797:46,10 [18] Templates.cshtml) + CSharpCode - (797:46,10 [18] Templates.cshtml) RazorIRToken - (797:46,10 [18] Templates.cshtml) - CSharp - var parent = item; HtmlContent - (818:47,0 [53] Templates.cshtml) RazorIRToken - (818:47,0 [8] Templates.cshtml) - Html - @@ -142,5 +142,5 @@ Document - RazorIRToken - (957:51,10 [2] Templates.cshtml) - Html - \n RazorIRToken - (959:52,0 [5] Templates.cshtml) - Html - RazorIRToken - (964:52,5 [1] Templates.cshtml) - Html - - CSharpStatement - (12:0,12 [265] Templates.cshtml) + CSharpCode - (12:0,12 [265] Templates.cshtml) RazorIRToken - (12:0,12 [265] Templates.cshtml) - CSharp - \n public HelperResult Repeat(int times, Func template) {\n return new HelperResult((writer) => {\n for(int i = 0; i < times; i++) {\n ((HelperResult)template(i)).WriteTo(writer);\n }\n });\n }\n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt index 1943b4927b..f7a65caa89 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt @@ -4,13 +4,13 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_DesignTime - - DesignTimeDirective - DirectiveToken - (14:0,14 [17] TransitionsInTagHelperAttributes.cshtml) - "*, TestAssembly" - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:0,31 [2] TransitionsInTagHelperAttributes.cshtml) RazorIRToken - (31:0,31 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n - CSharpStatement - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) + CSharpCode - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) RazorIRToken - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) - CSharp - \n var @class = "container-fluid";\n var @int = 1;\n HtmlContent - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) RazorIRToken - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n @@ -20,7 +20,7 @@ Document - RazorIRToken - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes - CSharpStatementAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - + CSharpCodeAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - SetTagHelperProperty - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes RazorIRToken - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - 1337 HtmlContent - (143:6,44 [2] TransitionsInTagHelperAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt index 220f92e18e..5e78229593 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt @@ -5,7 +5,7 @@ Document - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - test - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) + CSharpCode - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) RazorIRToken - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) - CSharp - \n var @class = "container-fluid";\n var @int = 1;\n HtmlContent - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) RazorIRToken - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) - Html - \n @@ -15,7 +15,7 @@ Document - RazorIRToken - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes - CSharpStatementAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - + CSharpCodeAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - SetTagHelperProperty - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes RazorIRToken - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - 1337 HtmlContent - (143:6,44 [2] TransitionsInTagHelperAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt index 0409701e84..1e7315c5a9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt @@ -3,12 +3,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) + CSharpCode - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) RazorIRToken - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n CSharpExpression - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) RazorIRToken - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) - CSharp - DateTime. - CSharpStatement - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) + CSharpCode - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) RazorIRToken - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt index f398d63fb9..1af61a73e7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt @@ -3,9 +3,9 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_Runtime - - MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync - CSharpStatement - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) + CSharpCode - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) RazorIRToken - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n CSharpExpression - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) RazorIRToken - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) - CSharp - DateTime. - CSharpStatement - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) + CSharpCode - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) RazorIRToken - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt index c28d907ad6..0c4d549a5f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt @@ -9,7 +9,7 @@ Document - UsingStatement - (123:6,1 [41] Usings.cshtml) - static global::System.Text.Encoding ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_DesignTime - - DesignTimeDirective - - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (16:0,16 [2] Usings.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt index 2473c93b2a..17f745d9ee 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.ir.txt @@ -4,6 +4,6 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_ExtensibleDirectiveTest_NamespaceToken - - DesignTimeDirective - DirectiveToken - (8:0,8 [20] NamespaceToken.cshtml) - System.Globalization - CSharpStatement - + CSharpCode - RazorIRToken - - CSharp - private static System.Object __o = null; MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/RazorIRNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/RazorIRNodeWriter.cs index 25beb86422..6387219a06 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/RazorIRNodeWriter.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/RazorIRNodeWriter.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests WriteContentNode(node, node.Prefix); } - public override void VisitCSharpStatementAttributeValue(CSharpStatementAttributeValueIRNode node) + public override void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIRNode node) { WriteContentNode(node, node.Prefix); } diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/RazorIRAssert.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/RazorIRAssert.cs index 039d91e57e..2504c30925 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/RazorIRAssert.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/RazorIRAssert.cs @@ -113,11 +113,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate } } - public static void CSharpStatement(string expected, RazorIRNode node) + public static void CSharpCode(string expected, RazorIRNode node) { try { - var statement = Assert.IsType(node); + var statement = Assert.IsType(node); var content = new StringBuilder(); for (var i = 0; i < statement.Children.Count; i++) { @@ -283,7 +283,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { try { - var beginNode = Assert.IsType(node); + var beginNode = Assert.IsType(node); var content = new StringBuilder(); for (var i = 0; i < beginNode.Children.Count; i++) { @@ -304,7 +304,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { try { - var endNode = Assert.IsType(node); + var endNode = Assert.IsType(node); var content = new StringBuilder(); for (var i = 0; i < endNode.Children.Count; i++) {