From e0b8532735997c439e11fff68dd342d5af59f05f Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 29 May 2015 23:07:55 -0700 Subject: [PATCH] Update names and spacing of some missed ChunkTree renames. --- .../Directives/ChunkHelper.cs | 7 ++++--- src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs | 12 ++++++------ .../Directives/ChunkInheritanceUtilityTest.cs | 8 ++++---- .../MvcRazorHostTest.cs | 10 +++++----- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/ChunkHelper.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/ChunkHelper.cs index 352dbc61f2..dc19136445 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/ChunkHelper.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/Directives/ChunkHelper.cs @@ -49,9 +49,10 @@ namespace Microsoft.AspNet.Mvc.Razor.Directives { // If there's more than 1 model chunk there will be a Razor error BUT we want intellisense to show up on // the current model chunk that the user is typing. - return chunkTree.Chunks - .OfType() - .LastOrDefault(); + return chunkTree + .Chunks + .OfType() + .LastOrDefault(); } /// diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs index aa9e01e117..2278c4e941 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs @@ -45,12 +45,12 @@ namespace Microsoft.AspNet.Mvc.Razor private readonly RazorPathNormalizer _pathNormalizer; private ChunkInheritanceUtility _chunkInheritanceUtility; - internal MvcRazorHost(IChunkTreeCache ChunkTreeCache, RazorPathNormalizer pathNormalizer) + internal MvcRazorHost(IChunkTreeCache chunkTreeCache, RazorPathNormalizer pathNormalizer) : base(new CSharpRazorCodeLanguage()) { _pathNormalizer = pathNormalizer; _baseType = BaseType; - _chunkTreeCache = ChunkTreeCache; + _chunkTreeCache = chunkTreeCache; TagHelperDescriptorResolver = new TagHelperDescriptorResolver(); DefaultBaseClass = BaseType + "<" + DefaultModel + ">"; @@ -124,11 +124,11 @@ namespace Microsoft.AspNet.Mvc.Razor } #endif /// - /// Initializes a new instance of using the specified . + /// Initializes a new instance of using the specified . /// - /// An rooted at the application base path. - public MvcRazorHost(IChunkTreeCache ChunkTreeCache) - : this(ChunkTreeCache, new RazorPathNormalizer()) + /// An rooted at the application base path. + public MvcRazorHost(IChunkTreeCache chunkTreeCache) + : this(chunkTreeCache, new RazorPathNormalizer()) { } diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Directives/ChunkInheritanceUtilityTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Directives/ChunkInheritanceUtilityTest.cs index 30f219aab3..dc53c8d209 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Directives/ChunkInheritanceUtilityTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Directives/ChunkInheritanceUtilityTest.cs @@ -39,10 +39,10 @@ namespace Microsoft.AspNet.Mvc.Razor.Directives // Assert Assert.Collection(chunkTrees, - ChunkTree => + chunkTree => { var viewImportsPath = @"Views\home\_ViewImports.cshtml"; - Assert.Collection(ChunkTree.Chunks, + Assert.Collection(chunkTree.Chunks, chunk => { Assert.IsType(chunk); @@ -60,10 +60,10 @@ namespace Microsoft.AspNet.Mvc.Razor.Directives Assert.Equal(viewImportsPath, chunk.Start.FilePath); }); }, - ChunkTree => + chunkTree => { var viewImportsPath = @"Views\_ViewImports.cshtml"; - Assert.Collection(ChunkTree.Chunks, + Assert.Collection(chunkTree.Chunks, chunk => { Assert.IsType(chunk); diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs index 5dabb95927..0fbac79109 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Mvc.Razor var rootedAppPath = $"{rootPrefix}SomeComputer/Location/Project/"; var rootedFilePath = $"{rootPrefix}SomeComputer/Location/Project/src/file.cshtml"; var host = new MvcRazorHost( - ChunkTreeCache: null, + chunkTreeCache: null, pathNormalizer: new DesignTimeRazorPathNormalizer(rootedAppPath)); var parser = new RazorParser( host.CodeLanguage.CreateCodeParser(), @@ -59,10 +59,10 @@ namespace Microsoft.AspNet.Mvc.Razor var rootedAppPath = $"{rootPrefix}SomeComputer/Location/Project/"; var rootedFilePath = $"{rootPrefix}SomeComputer/Location/Project/src/file.cshtml"; var host = new MvcRazorHost( - ChunkTreeCache: null, + chunkTreeCache: null, pathNormalizer: new DesignTimeRazorPathNormalizer(rootedAppPath)); var chunkInheritanceUtility = new PathValidatingChunkInheritanceUtility(host); - var CodeGeneratorContext = new CodeGeneratorContext( + var codeGeneratorContext = new CodeGeneratorContext( new ChunkGeneratorContext( host, host.DefaultClassName, @@ -70,11 +70,11 @@ namespace Microsoft.AspNet.Mvc.Razor rootedFilePath, shouldGenerateLinePragmas: true), new ErrorSink()); - var codeGenerator = new CSharpCodeGenerator(CodeGeneratorContext); + var codeGenerator = new CSharpCodeGenerator(codeGeneratorContext); host.ChunkInheritanceUtility = chunkInheritanceUtility; // Act - host.DecorateCodeGenerator(codeGenerator, CodeGeneratorContext); + host.DecorateCodeGenerator(codeGenerator, codeGeneratorContext); // Assert Assert.Equal("src/file.cshtml", chunkInheritanceUtility.InheritedChunkTreePagePath, StringComparer.Ordinal);