From be10bb5f7bbdbe4e3efbe8d84ccfaf495617350d Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 18 Jan 2017 09:08:50 -0800 Subject: [PATCH] Remove support for includes I was mistaken, this isn't a feature we will need for _ViewStart. --- .../DefaultRazorCodeDocument.cs | 6 +----- .../DefaultRazorParsingPhase.cs | 7 ------- .../RazorCodeDocument.cs | 9 +++------ .../RazorCodeDocumentExtensions.cs | 20 ------------------- .../DefaultRazorCodeDocumentTest.cs | 17 ++++------------ .../DefaultRazorParsingPhaseTest.cs | 15 ++------------ .../RazorCodeDocumentExtensionsTest.cs | 16 --------------- .../RazorCodeDocumentTest.cs | 17 ++++------------ .../TestRazorCodeDocument.cs | 9 ++++----- 9 files changed, 18 insertions(+), 98 deletions(-) diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorCodeDocument.cs b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorCodeDocument.cs index 385f5fe18f..8f5d29a2d1 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorCodeDocument.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorCodeDocument.cs @@ -11,8 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution { public DefaultRazorCodeDocument( RazorSourceDocument source, - IEnumerable imports, - IEnumerable includes) + IEnumerable imports) { if (source == null) { @@ -21,15 +20,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution Source = source; Imports = imports?.ToArray() ?? RazorSourceDocument.EmptyArray; - Includes = includes?.ToArray() ?? RazorSourceDocument.EmptyArray; Items = new DefaultItemCollection(); } public override IReadOnlyList Imports { get; } - public override IReadOnlyList Includes { get; } - public override ItemCollection Items { get; } public override RazorSourceDocument Source { get; } diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorParsingPhase.cs b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorParsingPhase.cs index 2f005b0551..1e344ca25d 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorParsingPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorParsingPhase.cs @@ -31,13 +31,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution importSyntaxTrees[i] = RazorSyntaxTree.Parse(codeDocument.Imports[i], options); } codeDocument.SetImportSyntaxTrees(importSyntaxTrees); - - var includeSyntaxTrees = new RazorSyntaxTree[codeDocument.Includes.Count]; - for (var i = 0; i < codeDocument.Includes.Count; i++) - { - includeSyntaxTrees[i] = RazorSyntaxTree.Parse(codeDocument.Includes[i], options); - } - codeDocument.SetIncludeSyntaxTrees(includeSyntaxTrees); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocument.cs b/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocument.cs index b4e66058b0..6558fa3fef 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocument.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocument.cs @@ -15,28 +15,25 @@ namespace Microsoft.AspNetCore.Razor.Evolution throw new ArgumentNullException(nameof(source)); } - return Create(source, imports: null, includes: null); + return Create(source, imports: null); } public static RazorCodeDocument Create( RazorSourceDocument source, - IEnumerable imports, - IEnumerable includes) + IEnumerable imports) { if (source == null) { throw new ArgumentNullException(nameof(source)); } - return new DefaultRazorCodeDocument(source, imports, includes); + return new DefaultRazorCodeDocument(source, imports); } public abstract IReadOnlyList Imports { get; } public abstract ItemCollection Items { get; } - public abstract IReadOnlyList Includes { get; } - public abstract RazorSourceDocument Source { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocumentExtensions.cs b/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocumentExtensions.cs index fe91b166c3..079a3162aa 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocumentExtensions.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/RazorCodeDocumentExtensions.cs @@ -49,26 +49,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution document.Items[typeof(ImportSyntaxTreesHolder)] = new ImportSyntaxTreesHolder(syntaxTrees); } - public static IReadOnlyList GetIncludeSyntaxTrees(this RazorCodeDocument document) - { - if (document == null) - { - throw new ArgumentNullException(nameof(document)); - } - - return (document.Items[typeof(IncludeSyntaxTreesHolder)] as IncludeSyntaxTreesHolder)?.SyntaxTrees; - } - - public static void SetIncludeSyntaxTrees(this RazorCodeDocument document, IReadOnlyList syntaxTrees) - { - if (document == null) - { - throw new ArgumentNullException(nameof(document)); - } - - document.Items[typeof(IncludeSyntaxTreesHolder)] = new IncludeSyntaxTreesHolder(syntaxTrees); - } - public static DocumentIRNode GetIRDocument(this RazorCodeDocument document) { if (document == null) diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorCodeDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorCodeDocumentTest.cs index 95d7de0941..72a784b75c 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorCodeDocumentTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorCodeDocumentTest.cs @@ -17,14 +17,9 @@ namespace Microsoft.AspNetCore.Razor.Evolution { TestRazorSourceDocument.Create(), }; - - var includes = new RazorSourceDocument[] - { - TestRazorSourceDocument.Create(), - }; - + // Act - var code = new DefaultRazorCodeDocument(source, imports, includes); + var code = new DefaultRazorCodeDocument(source, imports); // Assert Assert.Same(source, code.Source); @@ -32,25 +27,21 @@ namespace Microsoft.AspNetCore.Razor.Evolution Assert.NotSame(imports, code.Imports); Assert.Collection(imports, d => Assert.Same(imports[0], d)); - - Assert.NotSame(includes, code.Includes); - Assert.Collection(includes, d => Assert.Same(includes[0], d)); } [Fact] - public void Ctor_AllowsNullForImportsAndIncludes() + public void Ctor_AllowsNullForImports() { // Arrange var source = TestRazorSourceDocument.Create(); // Act - var code = new DefaultRazorCodeDocument(source, imports: null, includes: null); + var code = new DefaultRazorCodeDocument(source, imports: null); // Assert Assert.Same(source, code.Source); Assert.NotNull(code.Items); Assert.Empty(code.Imports); - Assert.Empty(code.Includes); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorParsingPhaseTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorParsingPhaseTest.cs index 6b2a15e28b..c852e0b3b3 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorParsingPhaseTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/DefaultRazorParsingPhaseTest.cs @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution } [Fact] - public void Execute_ParsesIncludesAndImports() + public void Execute_ParsesImports() { // Arrange var phase = new DefaultRazorParsingPhase(); @@ -63,13 +63,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution TestRazorSourceDocument.Create(), }; - var includes = new[] - { - TestRazorSourceDocument.Create(), - TestRazorSourceDocument.Create(), - }; - - var codeDocument = TestRazorCodeDocument.Create(TestRazorSourceDocument.Create(), imports, includes); + var codeDocument = TestRazorCodeDocument.Create(TestRazorSourceDocument.Create(), imports); // Act phase.Execute(codeDocument); @@ -79,11 +73,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution codeDocument.GetImportSyntaxTrees(), t => { Assert.Same(t.Source, imports[0]); Assert.Equal("test_directive", Assert.Single(t.Options.Directives).Name); }, t => { Assert.Same(t.Source, imports[1]); Assert.Equal("test_directive", Assert.Single(t.Options.Directives).Name); }); - - Assert.Collection( - codeDocument.GetIncludeSyntaxTrees(), - t => { Assert.Same(t.Source, includes[0]); Assert.Equal("test_directive", Assert.Single(t.Options.Directives).Name); }, - t => { Assert.Same(t.Source, includes[1]); Assert.Equal("test_directive", Assert.Single(t.Options.Directives).Name); }); } private class MyConfigureParserOptions : IRazorConfigureParserFeature diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentExtensionsTest.cs index 0b87e9c84e..bf8aa8ae87 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentExtensionsTest.cs @@ -55,22 +55,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution Assert.Same(expected, actual); } - [Fact] - public void GetAndSetIncludeSyntaxTrees_ReturnsSyntaxTrees() - { - // Arrange - var codeDocument = TestRazorCodeDocument.CreateEmpty(); - - var expected = new[] { RazorSyntaxTree.Parse(codeDocument.Source), }; - codeDocument.SetIncludeSyntaxTrees(expected); - - // Act - var actual = codeDocument.GetIncludeSyntaxTrees(); - - // Assert - Assert.Same(expected, actual); - } - [Fact] public void GetIRDocument_ReturnsIRDocument() { diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentTest.cs index 8624003bb7..118c48ea86 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/RazorCodeDocumentTest.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution } [Fact] - public void Create_WithImportsAndIncludes() + public void Create_WithImports() { // Arrange var source = TestRazorSourceDocument.Create(); @@ -32,13 +32,8 @@ namespace Microsoft.AspNetCore.Razor.Evolution TestRazorSourceDocument.Create(), }; - var includes = new RazorSourceDocument[] - { - TestRazorSourceDocument.Create(), - }; - // Act - var code = RazorCodeDocument.Create(source, imports, includes); + var code = RazorCodeDocument.Create(source, imports); // Assert Assert.Same(source, code.Source); @@ -46,25 +41,21 @@ namespace Microsoft.AspNetCore.Razor.Evolution Assert.NotSame(imports, code.Imports); Assert.Collection(imports, d => Assert.Same(imports[0], d)); - - Assert.NotSame(includes, code.Includes); - Assert.Collection(includes, d => Assert.Same(includes[0], d)); } [Fact] - public void Create_WithImportsAndIncludes_AllsNull() + public void Create_WithImports_AllowsNull() { // Arrange var source = TestRazorSourceDocument.Create(); // Act - var code = RazorCodeDocument.Create(source, imports: null, includes: null); + var code = RazorCodeDocument.Create(source, imports: null); // Assert Assert.Same(source, code.Source); Assert.NotNull(code.Items); Assert.Empty(code.Imports); - Assert.Empty(code.Includes); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestRazorCodeDocument.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestRazorCodeDocument.cs index c8198f1fee..0efaab30b3 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestRazorCodeDocument.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestRazorCodeDocument.cs @@ -10,20 +10,19 @@ namespace Microsoft.AspNetCore.Razor.Evolution public static TestRazorCodeDocument CreateEmpty() { var source = TestRazorSourceDocument.Create(content: string.Empty); - return new TestRazorCodeDocument(source, imports: null, includes: null); + return new TestRazorCodeDocument(source, imports: null); } public static TestRazorCodeDocument Create(string content) { var source = TestRazorSourceDocument.Create(content); - return new TestRazorCodeDocument(source, imports: null, includes: null); + return new TestRazorCodeDocument(source, imports: null); } private TestRazorCodeDocument( RazorSourceDocument source, - IEnumerable imports, - IEnumerable includes) - : base(source, imports, includes) + IEnumerable imports) + : base(source, imports) { } }