From d2469e078a649bb10b423e73427ede1a4606a4d0 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Tue, 20 Jun 2017 22:45:13 -0700 Subject: [PATCH] Move Source down to ExtensionIRNode --- .../InjectDirectiveIRNode.cs | 2 -- .../Extensions/SectionIRNode.cs | 2 -- .../Extensions/TemplateIRNode.cs | 2 -- .../Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs | 2 -- .../Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs | 2 -- .../DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs | 2 -- .../Intermediate/DesignTimeDirectiveIRNode.cs | 2 -- .../Intermediate/ExtensionIRNode.cs | 2 ++ .../Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs | 2 -- .../CodeGeneration/DesignTimeBasicWriterTest.cs | 2 -- .../Intermediate/ExtensionIRNodeTest.cs | 2 -- 11 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs index ec0b6af280..1ab5ddb3a5 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs @@ -16,8 +16,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get; set; } - public override void Accept(RazorIRNodeVisitor visitor) { if (visitor == null) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIRNode.cs index e26e6dbed6..7c31c0a027 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIRNode.cs @@ -13,8 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions public string Name { get; set; } - public override SourceSpan? Source { get; set; } - public override void Accept(RazorIRNodeVisitor visitor) { if (visitor == null) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIRNode.cs index 3bc0554e45..44445bf452 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIRNode.cs @@ -11,8 +11,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions { public override RazorIRNodeCollection Children { get; } = new DefaultIRNodeCollection(); - public override SourceSpan? Source { get; set; } - public override void Accept(RazorIRNodeVisitor visitor) { if (visitor == null) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs index 9b1671bfbd..da2030df7c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs @@ -12,8 +12,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get; set; } - public override bool HasDiagnostics => false; public string VariableName { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs index e1d2d9ec0b..88c47ed866 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs @@ -13,8 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get; set; } - public override bool HasDiagnostics => false; public string VariableName { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs index ddec9678a2..2400fb710c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs @@ -13,8 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get; set; } - public override bool HasDiagnostics => false; public string VariableName { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs index 30b0392995..235ac54246 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs @@ -10,8 +10,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { public override RazorIRNodeCollection Children { get; } = new DefaultIRNodeCollection(); - public override SourceSpan? Source { get; set; } - public override void Accept(RazorIRNodeVisitor visitor) { if (visitor == null) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs index 1ca010d844..d373645ba7 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs @@ -36,6 +36,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate } } + public override SourceSpan? Source { get; set; } + public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0; public abstract void WriteNode(CodeTarget target, CSharpRenderingContext context); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs index 870a61642c..1403500906 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs @@ -12,8 +12,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get; set; } - public override bool HasDiagnostics => false; public string VariableName { get; set; } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs index 792d86af17..0a4df32c99 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs @@ -551,8 +551,6 @@ Render Node - CSharpExpressionIRNode { public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public override void Accept(RazorIRNodeVisitor visitor) { throw new NotImplementedException(); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs index 9f1d301d3b..2bf7f701d6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs @@ -46,8 +46,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { public override RazorIRNodeCollection Children => ReadOnlyIRNodeCollection.Instance; - public override SourceSpan? Source { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public override void Accept(RazorIRNodeVisitor visitor) { // This is the standard visitor boilerplate for an extension node.