Fix #1355 Make extension nodes check for their extensions

aspnet · Jun 9, 2017 · 17800b6 · 17800b6
1 parent e05c697
commit 17800b6
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 0 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs
@@ -38,7 +38,18 @@ public override void WriteNode(CodeTarget target, CSharpRenderingContext context
                 throw new ArgumentNullException(nameof(target));
             }
 
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<IInjectDirectiveTargetExtension>();
+            if (extension == null)
+            {
+                context.ReportMissingExtension<IInjectDirectiveTargetExtension>();
+                return;
+            }
+
             extension.WriteInjectProperty(context, this);
         }
     }

diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/TemplateIRNode.cs
@@ -28,6 +28,16 @@ public override void Accept(RazorIRNodeVisitor visitor)
 
         public override void WriteNode(CodeTarget target, CSharpRenderingContext context)
         {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<ITemplateTargetExtension>();
             if (extension == null)
             {

diff --git a/...oft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs b/...oft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs
@@ -29,7 +29,23 @@ public override void Accept(RazorIRNodeVisitor visitor)
 
         public override void WriteNode(CodeTarget target, CSharpRenderingContext context)
         {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                context.ReportMissingExtension<IPreallocatedAttributeTargetExtension>();
+                return;
+            }
+
             extension.WriteAddPreallocatedTagHelperHtmlAttribute(context, this);
         }
     }

diff --git a/...oft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs b/...oft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs
@@ -36,7 +36,23 @@ public override void Accept(RazorIRNodeVisitor visitor)
 
         public override void WriteNode(CodeTarget target, CSharpRenderingContext context)
         {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                context.ReportMissingExtension<IPreallocatedAttributeTargetExtension>();
+                return;
+            }
+
             extension.WriteDeclarePreallocatedTagHelperAttribute(context, this);
         }
     }

diff --git a/...AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs b/...AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs
@@ -36,7 +36,23 @@ public override void Accept(RazorIRNodeVisitor visitor)
 
         public override void WriteNode(CodeTarget target, CSharpRenderingContext context)
         {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                context.ReportMissingExtension<IPreallocatedAttributeTargetExtension>();
+                return;
+            }
+
             extension.WriteDeclarePreallocatedTagHelperHtmlAttribute(context, this);
         }
     }

diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs
@@ -27,7 +27,23 @@ public override void Accept(RazorIRNodeVisitor visitor)
 
         public override void WriteNode(CodeTarget target, CSharpRenderingContext context)
         {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<IDesignTimeDirectiveTargetExtension>();
+            if (extension == null)
+            {
+                context.ReportMissingExtension<IDesignTimeDirectiveTargetExtension>();
+                return;
+            }
+
             extension.WriteDesignTimeDirective(context, this);
         }
     }

diff --git a/...icrosoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs b/...icrosoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs
@@ -42,7 +42,23 @@ public override void Accept(RazorIRNodeVisitor visitor)
 
         public override void WriteNode(CodeTarget target, CSharpRenderingContext context)
         {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var extension = target.GetExtension<IPreallocatedAttributeTargetExtension>();
+            if (extension == null)
+            {
+                context.ReportMissingExtension<IPreallocatedAttributeTargetExtension>();
+                return;
+            }
+
             extension.WriteSetPreallocatedTagHelperProperty(context, this);
         }
     }