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

Fix #1312 - make ExecuteCore protected

This commit is contained in:
Ryan Nowak 2017-05-12 17:54:09 -07:00
parent 3830a1b7ac
commit 2ec2b98f83
16 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// Runs after the @model and @namespace directives
public override int Order => 10;
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var visitor = new Visitor();
visitor.Visit(irDocument);

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{
public override int Order => DefaultFeatureOrder;
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var walker = new Visitor();
walker.VisitDocument(irDocument);

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs
View File

@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// Runs after the @inherits directive
public override int Order => 5;
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var visitor = new Visitor();
var modelType = GetModelType(irDocument, visitor);

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs
View File

@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{
private const string ModelExpressionTypeName = "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression";
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var visitor = new Visitor();
visitor.Visit(irDocument);

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// internal for testing
internal class Pass : RazorIRPassBase, IRazorDirectiveClassifierPass
{
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
if (irDocument.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
irDocument.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{
public class PagesPropertyInjectionPass : RazorIRPassBase, IRazorIROptimizationPass
{
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
if (irDocument.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind)
{

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
View File

@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{
public class ViewComponentTagHelperPass : RazorIRPassBase, IRazorIROptimizationPass
{
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var visitor = new Visitor();
visitor.Visit(irDocument);

2
src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{
internal class DefaultDirectiveIRPass : RazorIRPassBase, IRazorDirectiveClassifierPass
{
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var parserOptions = irDocument.Options;

2
src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalIROptimizationPass.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{
public override int Order => DefaultFeatureOrder + 50;
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var visitor = new Visitor();
visitor.VisitDocument(irDocument);

2
src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language
TargetExtensions = feature.FirstOrDefault()?.TargetExtensions.ToArray() ?? EmptyExtensionArray;
}
public sealed override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected sealed override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
if (irDocument.DocumentKind != null)
{

2
src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
// This needs to run before other directive classifiers.
public override int Order => -10;
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var walker = new DesignTimeHelperWalker();
walker.VisitDocument(irDocument);

2
src/Microsoft.AspNetCore.Razor.Language/RazorIRPassBase.cs
View File

@ -85,6 +85,6 @@ namespace Microsoft.AspNetCore.Razor.Language
ExecuteCore(codeDocument, irDocument);
}
public abstract void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument);
protected abstract void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument);
}
}

2
src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{
public override int Order => DefaultFeatureOrder;
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var walker = new PreallocatedTagHelperWalker();
walker.VisitDocument(irDocument);

3
src/RazorPageGenerator/RemovePragmaChecksumFeature.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.Language.Intermediate;
@ -9,7 +8,7 @@ namespace RazorPageGenerator
{
public class RemovePragmaChecksumFeature : RazorIRPassBase, IRazorIROptimizationPass
{
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var walker = new Walker();
walker.Visit(irDocument);

63
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
View File

@ -29,10 +29,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -57,10 +60,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -85,10 +91,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -112,10 +121,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -148,10 +160,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -196,10 +211,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -233,10 +251,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -263,10 +284,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(
@ -294,10 +318,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var irDocument = (DocumentIRNode)builder.Build();
var pass = new InstrumentationPass();
var pass = new InstrumentationPass()
{
Engine = RazorEngine.CreateEmpty(b => { }),
};
// Act
pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
// Assert
Children(

2
test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntegrationTestBase.cs
View File

@ -213,7 +213,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
protected class ApiSetsIRTestAdapter : RazorIRPassBase, IRazorIROptimizationPass
{
public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
{
var walker = new ApiSetsIRWalker();
walker.Visit(irDocument);