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 65f74eb008..2c0fa22876 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
@@ -31,30 +31,30 @@ Document -
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml)
-                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml)
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
-                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml)
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml)
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml)
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml)
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
                 HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml)
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml)
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml)
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
                 HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
             Inject - 
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 1ae6828ead..1ea163df4a 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
@@ -17,43 +17,43 @@ Document -
                     IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml)
-                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml)
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(108, 5, true);
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml)
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(119, 2, true);
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml)
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(128, 4, true);
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml)
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(139, 2, true);
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml)
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(149, 2, true);
                 HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml)
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(176, 4, true);
@@ -61,14 +61,14 @@ Document -
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml)
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(190, 2, true);
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
                 CSharpCode - 
                     IntermediateToken -  - CSharp - EndContext();
-                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml)
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(203, 2, true);
                 HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
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 f2aedc86da..b80797cd54 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
@@ -28,7 +28,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - private static System.Object __o = null;
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml)
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
                 HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
                     IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
             Inject - 
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 77e8f8df38..33f1f5b60a 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
@@ -11,7 +11,7 @@ Document -
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml)
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(11, 5, true);
                 HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
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 b05fa8317f..973cc6cf4f 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
@@ -28,7 +28,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - private static System.Object __o = null;
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml)
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
                     IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
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 2f07ce6b82..4ffdea43ac 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
@@ -11,7 +11,7 @@ Document -
         UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml)
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
                 CSharpCode - 
                     IntermediateToken -  - CSharp - BeginContext(6, 49, true);
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
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 10571f85ea..2fdfdb6f35 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
@@ -30,7 +30,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - private static System.Object __o = null;
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (30:1,0 [39] MultipleModels.cshtml)
+                MalformedDirective - (30:1,0 [39] MultipleModels.cshtml) - model
                     DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
             Inject - 
             Inject - 
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 3a2ae6593b..a7e964cb17 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
@@ -16,57 +16,57 @@ Document -
             MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (100:2,13 [0] IncompleteDirectives.cshtml)
+                MalformedDirective - (100:2,13 [0] IncompleteDirectives.cshtml) - addTagHelper
                     DirectiveToken - (100:2,13 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (100:2,13 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (100:2,13 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (116:3,14 [0] IncompleteDirectives.cshtml)
+                MalformedDirective - (116:3,14 [0] IncompleteDirectives.cshtml) - addTagHelper
                     DirectiveToken - (116:3,14 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (116:3,14 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (116:3,14 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (132:4,14 [1] IncompleteDirectives.cshtml)
+                MalformedDirective - (132:4,14 [1] IncompleteDirectives.cshtml) - addTagHelper
                     DirectiveToken - (132:4,14 [1] IncompleteDirectives.cshtml) - "
                 HtmlContent - (133:4,15 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (133:4,15 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (153:6,16 [0] IncompleteDirectives.cshtml)
+                MalformedDirective - (153:6,16 [0] IncompleteDirectives.cshtml) - removeTagHelper
                     DirectiveToken - (153:6,16 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (153:6,16 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (153:6,16 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (172:7,17 [0] IncompleteDirectives.cshtml)
+                MalformedDirective - (172:7,17 [0] IncompleteDirectives.cshtml) - removeTagHelper
                     DirectiveToken - (172:7,17 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (172:7,17 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (172:7,17 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (191:8,17 [1] IncompleteDirectives.cshtml)
+                MalformedDirective - (191:8,17 [1] IncompleteDirectives.cshtml) - removeTagHelper
                     DirectiveToken - (191:8,17 [1] IncompleteDirectives.cshtml) - "
                 HtmlContent - (192:8,18 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (192:8,18 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (212:10,16 [0] IncompleteDirectives.cshtml)
+                MalformedDirective - (212:10,16 [0] IncompleteDirectives.cshtml) - tagHelperPrefix
                     DirectiveToken - (212:10,16 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (212:10,16 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (212:10,16 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (231:11,17 [0] IncompleteDirectives.cshtml)
+                MalformedDirective - (231:11,17 [0] IncompleteDirectives.cshtml) - tagHelperPrefix
                     DirectiveToken - (231:11,17 [0] IncompleteDirectives.cshtml) - 
                 HtmlContent - (231:11,17 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (231:11,17 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (250:12,17 [1] IncompleteDirectives.cshtml)
+                MalformedDirective - (250:12,17 [1] IncompleteDirectives.cshtml) - tagHelperPrefix
                     DirectiveToken - (250:12,17 [1] IncompleteDirectives.cshtml) - "
                 HtmlContent - (251:12,18 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (251:12,18 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml)
+                MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml) - inherits
                 HtmlContent - (264:14,9 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml)
+                MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml) - inherits
                 HtmlContent - (276:15,10 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (276:15,10 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml)
-                MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml)
-                MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml)
+                MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml) - section
                 HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml)
+                MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml) - section
                 HtmlContent - (326:21,9 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (326:21,9 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (330:23,0 [9] IncompleteDirectives.cshtml)
+                MalformedDirective - (330:23,0 [9] IncompleteDirectives.cshtml) - section
                 HtmlContent - (339:23,9 [3] IncompleteDirectives.cshtml)
                     IntermediateToken - (339:23,9 [3] IncompleteDirectives.cshtml) - Html - {\n
-                MalformedDirective - (342:24,0 [12] IncompleteDirectives.cshtml)
+                MalformedDirective - (342:24,0 [12] IncompleteDirectives.cshtml) - functions
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 6ce60ae682..ba23934871 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
@@ -4,45 +4,45 @@ Document -
             MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (100:2,13 [2] IncompleteDirectives.cshtml)
+                MalformedDirective - (100:2,13 [2] IncompleteDirectives.cshtml) - addTagHelper
                     DirectiveToken - (100:2,13 [2] IncompleteDirectives.cshtml) - 
-                MalformedDirective - (116:3,14 [2] IncompleteDirectives.cshtml)
+                MalformedDirective - (116:3,14 [2] IncompleteDirectives.cshtml) - addTagHelper
                     DirectiveToken - (116:3,14 [2] IncompleteDirectives.cshtml) - 
-                MalformedDirective - (132:4,14 [3] IncompleteDirectives.cshtml)
+                MalformedDirective - (132:4,14 [3] IncompleteDirectives.cshtml) - addTagHelper
                     DirectiveToken - (132:4,14 [3] IncompleteDirectives.cshtml) - "
                 HtmlContent - (135:5,0 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (135:5,0 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (153:6,16 [2] IncompleteDirectives.cshtml)
+                MalformedDirective - (153:6,16 [2] IncompleteDirectives.cshtml) - removeTagHelper
                     DirectiveToken - (153:6,16 [2] IncompleteDirectives.cshtml) - 
-                MalformedDirective - (172:7,17 [2] IncompleteDirectives.cshtml)
+                MalformedDirective - (172:7,17 [2] IncompleteDirectives.cshtml) - removeTagHelper
                     DirectiveToken - (172:7,17 [2] IncompleteDirectives.cshtml) - 
-                MalformedDirective - (191:8,17 [3] IncompleteDirectives.cshtml)
+                MalformedDirective - (191:8,17 [3] IncompleteDirectives.cshtml) - removeTagHelper
                     DirectiveToken - (191:8,17 [3] IncompleteDirectives.cshtml) - "
                 HtmlContent - (194:9,0 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (194:9,0 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (212:10,16 [2] IncompleteDirectives.cshtml)
+                MalformedDirective - (212:10,16 [2] IncompleteDirectives.cshtml) - tagHelperPrefix
                     DirectiveToken - (212:10,16 [2] IncompleteDirectives.cshtml) - 
-                MalformedDirective - (231:11,17 [2] IncompleteDirectives.cshtml)
+                MalformedDirective - (231:11,17 [2] IncompleteDirectives.cshtml) - tagHelperPrefix
                     DirectiveToken - (231:11,17 [2] IncompleteDirectives.cshtml) - 
-                MalformedDirective - (250:12,17 [3] IncompleteDirectives.cshtml)
+                MalformedDirective - (250:12,17 [3] IncompleteDirectives.cshtml) - tagHelperPrefix
                     DirectiveToken - (250:12,17 [3] IncompleteDirectives.cshtml) - "
                 HtmlContent - (253:13,0 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (253:13,0 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml)
+                MalformedDirective - (255:14,0 [9] IncompleteDirectives.cshtml) - inherits
                 HtmlContent - (264:14,9 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (264:14,9 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml)
+                MalformedDirective - (266:15,0 [10] IncompleteDirectives.cshtml) - inherits
                 HtmlContent - (276:15,10 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (276:15,10 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml)
-                MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml)
-                MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml)
+                MalformedDirective - (280:17,0 [12] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (292:18,0 [15] IncompleteDirectives.cshtml) - functions
+                MalformedDirective - (307:20,0 [8] IncompleteDirectives.cshtml) - section
                 HtmlContent - (315:20,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (315:20,8 [2] IncompleteDirectives.cshtml) - Html - \n
-                MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml)
+                MalformedDirective - (317:21,0 [9] IncompleteDirectives.cshtml) - section
                 HtmlContent - (326:21,9 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (326:21,9 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                MalformedDirective - (330:23,0 [9] IncompleteDirectives.cshtml)
+                MalformedDirective - (330:23,0 [9] IncompleteDirectives.cshtml) - section
                 HtmlContent - (339:23,9 [3] IncompleteDirectives.cshtml)
                     IntermediateToken - (339:23,9 [3] IncompleteDirectives.cshtml) - Html - {\n
-                MalformedDirective - (342:24,0 [12] IncompleteDirectives.cshtml)
+                MalformedDirective - (342:24,0 [12] IncompleteDirectives.cshtml) - functions
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 a0662f5b04..2d8e66b416 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
@@ -6,7 +6,7 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - private static System.Object __o = null;
             MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (0:0,0 [13] InlineBlocks.cshtml)
+                MalformedDirective - (0:0,0 [13] InlineBlocks.cshtml) - section
                     DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link
                 HtmlContent - (13:0,13 [23] InlineBlocks.cshtml)
                     IntermediateToken - (13:0,13 [21] InlineBlocks.cshtml) - Html - (string link) {\n    
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
index eecc283b98..30f475ca18 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
@@ -2,7 +2,7 @@ Document -
     NamespaceDeclaration -  - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_Runtime -  - 
             MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
-                MalformedDirective - (0:0,0 [13] InlineBlocks.cshtml)
+                MalformedDirective - (0:0,0 [13] InlineBlocks.cshtml) - section
                     DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link
                 HtmlContent - (13:0,13 [23] InlineBlocks.cshtml)
                     IntermediateToken - (13:0,13 [21] InlineBlocks.cshtml) - Html - (string link) {\n    
diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs
index bb78dfe084..4431bf6467 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs
@@ -50,6 +50,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             WriteContentNode(node, node.Kind.ToString(), node.Content);
         }
 
+        public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+        {
+            WriteContentNode(node, node.Name);
+        }
+
         public override void VisitDirective(DirectiveIntermediateNode node)
         {
             WriteContentNode(node, node.Name);