huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplification of IntermediateNode

This commit is contained in:
Ryan Nowak 2017-07-02 16:44:57 -07:00
parent 112cbc0bb6
commit a7cc63d6e1
32 changed files with 30 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperHtmlAttributeIntermediateNode.cs
View File

@ -9,12 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{
internal sealed class PreallocatedTagHelperHtmlAttributeIntermediateNode : ExtensionIntermediateNode
{
public override RazorDiagnosticCollection Diagnostics { get; } = ReadOnlyDiagnosticCollection.Instance;
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override bool HasDiagnostics => false;
public string VariableName { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

4
src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperHtmlAttributeValueIntermediateNode.cs
View File

@ -33,12 +33,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
}
}
public override RazorDiagnosticCollection Diagnostics { get; } = ReadOnlyDiagnosticCollection.Instance;
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override bool HasDiagnostics => false;
public string VariableName { get; set; }
public string AttributeName { get; set; }

4
src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs
View File

@ -30,12 +30,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
TagHelper = propertyNode.TagHelper;
}
public override RazorDiagnosticCollection Diagnostics => ReadOnlyDiagnosticCollection.Instance;
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override bool HasDiagnostics => false;
public string AttributeName { get; set; }
public AttributeStructure AttributeStructure { get; set; }

4
src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyValueIntermediateNode.cs
View File

@ -9,12 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{
internal sealed class PreallocatedTagHelperPropertyValueIntermediateNode : ExtensionIntermediateNode
{
public override RazorDiagnosticCollection Diagnostics { get; } = ReadOnlyDiagnosticCollection.Instance;
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override bool HasDiagnostics => false;
public string VariableName { get; set; }
public string AttributeName { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeAttributeValueIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class CSharpCodeAttributeValueIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Prefix { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpCodeIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class CSharpCodeIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
if (visitor == null)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpExpressionAttributeValueIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class CSharpExpressionAttributeValueIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Prefix { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/CSharpExpressionIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class CSharpExpressionIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
if (visitor == null)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/ClassDeclarationIntermediateNode.cs
View File

@ -8,41 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class ClassDeclarationIntermediateNode : MemberDeclarationIntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public IList<string> Modifiers { get; } = new List<string>();
public string Name { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/DirectiveIntermediateNode.cs
View File

@ -8,41 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class DirectiveIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Name { get; set; }
public IEnumerable<DirectiveTokenIntermediateNode> Tokens => Children.OfType<DirectiveTokenIntermediateNode>();

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/DirectiveTokenIntermediateNode.cs
View File

@ -5,41 +5,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class DirectiveTokenIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Content { get; set; }
public DirectiveTokenDescriptor Descriptor { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIntermediateNode.cs
View File

@ -8,45 +8,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class DocumentIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public string DocumentKind { get; set; }
public RazorCodeGenerationOptions Options { get; set; }
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public CodeTarget Target { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIntermediateNode.cs
View File

@ -8,39 +8,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public abstract class ExtensionIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public abstract void WriteNode(CodeTarget target, CodeRenderingContext context);
protected static void AcceptExtensionNode<TNode>(TNode node, IntermediateNodeVisitor visitor)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/FieldDeclarationIntermediateNode.cs
View File

@ -8,41 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class FieldDeclarationIntermediateNode : MemberDeclarationIntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public IList<string> Modifiers { get; } = new List<string>();
public string Name { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlAttributeIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class HtmlAttributeIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string AttributeName { get; set; }
public string Prefix { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlAttributeValueIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class HtmlAttributeValueIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Prefix { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

34
src/Microsoft.AspNetCore.Razor.Language/Intermediate/HtmlContentIntermediateNode.cs
View File

@ -2,47 +2,13 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class HtmlContentIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
if (visitor == null)

35
src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNode.cs
View File

@ -5,16 +5,41 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public abstract class IntermediateNode
{
public abstract ItemCollection Annotations { get; }
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public abstract RazorDiagnosticCollection Diagnostics { get; }
public abstract IntermediateNodeCollection Children { get; }
public abstract SourceSpan? Source { get; set; }
public RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
public abstract bool HasDiagnostics { get; }
return _diagnostics;
}
}
public bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public SourceSpan? Source { get; set; }
public abstract void Accept(IntermediateNodeVisitor visitor);
}
}

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateToken.cs
View File

@ -7,35 +7,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class IntermediateToken : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public string Content { get; set; }
@ -46,10 +17,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
public TokenKind Kind { get; set; } = TokenKind.Unknown;
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
if (visitor == null)

21
src/Microsoft.AspNetCore.Razor.Language/Intermediate/MalformedDirectiveIntermediateNode.cs
View File

@ -8,29 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class MalformedDirectiveIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations { get; }
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Name { get; set; }
public IEnumerable<DirectiveTokenIntermediateNode> Tokens => Children.OfType<DirectiveTokenIntermediateNode>();

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/MethodDeclarationIntermediateNode.cs
View File

@ -8,41 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class MethodDeclarationIntermediateNode : MemberDeclarationIntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public IList<string> Modifiers { get; } = new List<string>();
public string Name { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/NamespaceDeclarationIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class NamespaceDeclarationIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Content { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/PropertyDeclarationIntermediateNode.cs
View File

@ -8,40 +8,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class PropertyDeclarationIntermediateNode : MemberDeclarationIntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public IList<string> Modifiers { get; } = new List<string>();

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperBodyIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class TagHelperBodyIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
if (visitor == null)

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperHtmlAttributeIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class TagHelperHtmlAttributeIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string AttributeName { get; set; }
public AttributeStructure AttributeStructure { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperIntermediateNode.cs
View File

@ -9,41 +9,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class TagHelperIntermediateNode : IntermediateNode
{
private ItemCollection _annotations;
private RazorDiagnosticCollection _diagnostics;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string TagName { get; set; }
public TagMode TagMode { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/TagHelperPropertyIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class TagHelperPropertyIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string AttributeName { get; set; }
public AttributeStructure AttributeStructure { get; set; }

33
src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingDirectiveIntermediateNode.cs
View File

@ -7,41 +7,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public sealed class UsingDirectiveIntermediateNode : IntermediateNode
{
private RazorDiagnosticCollection _diagnostics;
private ItemCollection _annotations;
public override ItemCollection Annotations
{
get
{
if (_annotations == null)
{
_annotations = new DefaultItemCollection();
}
return _annotations;
}
}
public override RazorDiagnosticCollection Diagnostics
{
get
{
if (_diagnostics == null)
{
_diagnostics = new DefaultRazorDiagnosticCollection();
}
return _diagnostics;
}
}
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => _diagnostics != null && _diagnostics.Count > 0;
public string Content { get; set; }
public override void Accept(IntermediateNodeVisitor visitor)

2
test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeNodeWriterTest.cs
View File

@ -609,8 +609,6 @@ WriteAttributeValue("" "", 27, false, 28, 6, false);
{
public override IntermediateNodeCollection Children => ReadOnlyIntermediateNodeCollection.Instance;
public override SourceSpan? Source { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public override void Accept(IntermediateNodeVisitor visitor)
{
throw new NotImplementedException();

8
test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/DefaultRazorIntermediateNodeBuilderTest.cs
View File

@ -206,16 +206,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
private class BasicIntermediateNode : IntermediateNode
{
public override ItemCollection Annotations { get; } = new DefaultItemCollection();
public override RazorDiagnosticCollection Diagnostics { get; } = new DefaultRazorDiagnosticCollection();
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => Diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
throw new NotImplementedException();

8
test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/IntermediateNodeReferenceTest.cs
View File

@ -497,16 +497,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
public string Name { get; }
public override ItemCollection Annotations { get; } = new DefaultItemCollection();
public override RazorDiagnosticCollection Diagnostics => new DefaultRazorDiagnosticCollection();
public override IntermediateNodeCollection Children { get; }
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => Diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
throw new System.NotImplementedException();

8
test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/IntermediateNodeWalkerTest.cs
View File

@ -124,16 +124,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
public string Name { get; }
public override ItemCollection Annotations { get; } = new DefaultItemCollection();
public override RazorDiagnosticCollection Diagnostics { get; } = new DefaultRazorDiagnosticCollection();
public override IntermediateNodeCollection Children { get; } = new DefaultIntermediateNodeCollection();
public override SourceSpan? Source { get; set; }
public override bool HasDiagnostics => Diagnostics.Count > 0;
public override void Accept(IntermediateNodeVisitor visitor)
{
((DerivedIntermediateNodeWalker)visitor).VisitBasic(this);