From 8cf7d248e7d1a0617f0f1551784f26c1a7281079 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Fri, 12 May 2017 15:55:16 -0700 Subject: [PATCH] [Issue #1318] Renamed RuntimeTarget to CodeTarget --- .../IInjectDirectiveTargetExtension.cs | 2 +- .../InjectDirectiveIRNode.cs | 2 +- .../{RuntimeTarget.cs => CodeTarget.cs} | 24 +++++++------- ...tRuntimeTarget.cs => DefaultCodeTarget.cs} | 6 ++-- ...Builder.cs => DefaultCodeTargetBuilder.cs} | 12 +++---- .../CodeGeneration/DefaultDocumentWriter.cs | 8 ++--- ...TargetBuilder.cs => ICodeTargetBuilder.cs} | 6 ++-- ...etExtension.cs => ICodeTargetExtension.cs} | 2 +- .../IDesignTimeDirectiveTargetExtension.cs | 2 +- .../IPreallocatedAttributeTargetExtension.cs | 2 +- .../ITemplateTargetExtension.cs | 2 +- .../DefaultRazorCSharpLoweringPhase.cs | 2 +- .../DefaultRazorTargetExtensionFeature.cs | 2 +- .../DocumentClassifierPassBase.cs | 10 +++--- .../IRazorTargetExtensionFeature.cs | 2 +- ...reallocatedTagHelperHtmlAttributeIRNode.cs | 2 +- ...arePreallocatedTagHelperAttributeIRNode.cs | 2 +- ...reallocatedTagHelperHtmlAttributeIRNode.cs | 2 +- .../Intermediate/DesignTimeDirectiveIRNode.cs | 2 +- .../Intermediate/DocumentIRNode.cs | 2 +- .../Intermediate/ExtensionIRNode.cs | 2 +- .../SetPreallocatedTagHelperPropertyIRNode.cs | 2 +- .../Intermediate/TemplateIRNode.cs | 2 +- .../RazorEngineBuilderExtensions.cs | 6 ++-- ...RuntimeTargetTest.cs => CodeTargetTest.cs} | 16 +++++----- ...est.cs => DefaultCodeTargetBuilderTest.cs} | 14 ++++---- ...TargetTest.cs => DefaultCodeTargetTest.cs} | 32 +++++++++---------- .../DefaultDocumentWriterTest.cs | 10 +++--- .../DesignTimeBasicWriterTest.cs | 2 +- .../CodeGeneration/RuntimeBasicWriterTest.cs | 2 +- .../DefaultRazorCSharpLoweringPhaseTest.cs | 8 ++--- .../DocumentClassifierPassBaseTest.cs | 16 +++++----- .../Intermediate/ExtensionIRNodeTest.cs | 2 +- .../RazorEngineBuilderExtensionsTest.cs | 2 +- 34 files changed, 105 insertions(+), 105 deletions(-) rename src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/{RuntimeTarget.cs => CodeTarget.cs} (73%) rename src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/{DefaultRuntimeTarget.cs => DefaultCodeTarget.cs} (85%) rename src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/{DefaultRuntimeTargetBuilder.cs => DefaultCodeTargetBuilder.cs} (54%) rename src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/{IRuntimeTargetBuilder.cs => ICodeTargetBuilder.cs} (72%) rename src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/{IRuntimeTargetExtension.cs => ICodeTargetExtension.cs} (84%) rename test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/{RuntimeTargetTest.cs => CodeTargetTest.cs} (72%) rename test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/{DefaultRuntimeTargetBuilderTest.cs => DefaultCodeTargetBuilderTest.cs} (67%) rename test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/{DefaultRuntimeTargetTest.cs => DefaultCodeTargetTest.cs} (76%) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IInjectDirectiveTargetExtension.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IInjectDirectiveTargetExtension.cs index 6a1db5fc6d..3ba47b58e9 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IInjectDirectiveTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/IInjectDirectiveTargetExtension.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language.CodeGeneration; namespace Microsoft.AspNetCore.Mvc.Razor.Extensions { - public interface IInjectDirectiveTargetExtension : IRuntimeTargetExtension + public interface IInjectDirectiveTargetExtension : ICodeTargetExtension { void WriteInjectProperty(CSharpRenderingContext context, InjectDirectiveIRNode node); } diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs index 0d292be614..894c098cad 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirectiveIRNode.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { if (target == null) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTarget.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTarget.cs similarity index 73% rename from src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTarget.cs rename to src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTarget.cs index b44150ed15..9a0f889c4c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTarget.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeTarget.cs @@ -5,9 +5,9 @@ using System; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - public abstract class RuntimeTarget + public abstract class CodeTarget { - public static RuntimeTarget CreateDefault(RazorCodeDocument codeDocument, RazorParserOptions options) + public static CodeTarget CreateDefault(RazorCodeDocument codeDocument, RazorParserOptions options) { if (codeDocument == null) { @@ -22,10 +22,10 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration return CreateDefault(codeDocument, options, configure: null); } - public static RuntimeTarget CreateDefault( + public static CodeTarget CreateDefault( RazorCodeDocument codeDocument, RazorParserOptions options, - Action configure) + Action configure) { if (codeDocument == null) { @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration throw new ArgumentNullException(nameof(options)); } - var builder = new DefaultRuntimeTargetBuilder(codeDocument, options); + var builder = new DefaultCodeTargetBuilder(codeDocument, options); if (builder.Options.DesignTimeMode) { @@ -56,10 +56,10 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration return builder.Build(); } - public static RuntimeTarget CreateEmpty( + public static CodeTarget CreateEmpty( RazorCodeDocument codeDocument, RazorParserOptions options, - Action configure) + Action configure) { if (codeDocument == null) { @@ -71,25 +71,25 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration throw new ArgumentNullException(nameof(options)); } - var builder = new DefaultRuntimeTargetBuilder(codeDocument, options); + var builder = new DefaultCodeTargetBuilder(codeDocument, options); configure?.Invoke(builder); return builder.Build(); } - internal static void AddDesignTimeDefaults(IRuntimeTargetBuilder builder) + internal static void AddDesignTimeDefaults(ICodeTargetBuilder builder) { } - internal static void AddRuntimeDefaults(IRuntimeTargetBuilder builder) + internal static void AddRuntimeDefaults(ICodeTargetBuilder builder) { } public abstract DocumentWriter CreateWriter(CSharpRenderingContext context); - public abstract TExtension GetExtension() where TExtension : class, IRuntimeTargetExtension; + public abstract TExtension GetExtension() where TExtension : class, ICodeTargetExtension; - public abstract bool HasExtension() where TExtension : class, IRuntimeTargetExtension; + public abstract bool HasExtension() where TExtension : class, ICodeTargetExtension; } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultRuntimeTarget.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTarget.cs similarity index 85% rename from src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultRuntimeTarget.cs rename to src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTarget.cs index 548311cc56..106736f244 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultRuntimeTarget.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTarget.cs @@ -7,17 +7,17 @@ using System.Linq; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - internal class DefaultRuntimeTarget : RuntimeTarget + internal class DefaultCodeTarget : CodeTarget { private readonly RazorParserOptions _options; - public DefaultRuntimeTarget(RazorParserOptions options, IEnumerable extensions) + public DefaultCodeTarget(RazorParserOptions options, IEnumerable extensions) { _options = options; Extensions = extensions.ToArray(); } - public IRuntimeTargetExtension[] Extensions { get; } + public ICodeTargetExtension[] Extensions { get; } public override DocumentWriter CreateWriter(CSharpRenderingContext context) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultRuntimeTargetBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTargetBuilder.cs similarity index 54% rename from src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultRuntimeTargetBuilder.cs rename to src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTargetBuilder.cs index 5431f7a551..736e348828 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultRuntimeTargetBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultCodeTargetBuilder.cs @@ -6,25 +6,25 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - internal class DefaultRuntimeTargetBuilder : IRuntimeTargetBuilder + internal class DefaultCodeTargetBuilder : ICodeTargetBuilder { - public DefaultRuntimeTargetBuilder(RazorCodeDocument codeDocument, RazorParserOptions options) + public DefaultCodeTargetBuilder(RazorCodeDocument codeDocument, RazorParserOptions options) { CodeDocument = codeDocument; Options = options; - TargetExtensions = new List(); + TargetExtensions = new List(); } public RazorCodeDocument CodeDocument { get; } public RazorParserOptions Options { get; } - public ICollection TargetExtensions { get; } + public ICollection TargetExtensions { get; } - public RuntimeTarget Build() + public CodeTarget Build() { - return new DefaultRuntimeTarget(Options, TargetExtensions); + return new DefaultCodeTarget(Options, TargetExtensions); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs index 86ee034c42..9d806b6d14 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs @@ -9,9 +9,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration internal class DefaultDocumentWriter : DocumentWriter { private readonly CSharpRenderingContext _context; - private readonly RuntimeTarget _target; + private readonly CodeTarget _target; - public DefaultDocumentWriter(RuntimeTarget target, CSharpRenderingContext context) + public DefaultDocumentWriter(CodeTarget target, CSharpRenderingContext context) { if (target == null) { @@ -48,9 +48,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration private class Visitor : RazorIRNodeVisitor { private readonly CSharpRenderingContext _context; - private readonly RuntimeTarget _target; + private readonly CodeTarget _target; - public Visitor(RuntimeTarget target, CSharpRenderingContext context) + public Visitor(CodeTarget target, CSharpRenderingContext context) { _target = target; _context = context; diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IRuntimeTargetBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetBuilder.cs similarity index 72% rename from src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IRuntimeTargetBuilder.cs rename to src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetBuilder.cs index b8f661150a..b87b535bad 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IRuntimeTargetBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetBuilder.cs @@ -5,14 +5,14 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - public interface IRuntimeTargetBuilder + public interface ICodeTargetBuilder { RazorCodeDocument CodeDocument { get; } RazorParserOptions Options { get; } - ICollection TargetExtensions { get; } + ICollection TargetExtensions { get; } - RuntimeTarget Build(); + CodeTarget Build(); } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IRuntimeTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetExtension.cs similarity index 84% rename from src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IRuntimeTargetExtension.cs rename to src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetExtension.cs index 3cf1ab5068..c8414f1335 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IRuntimeTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ICodeTargetExtension.cs @@ -3,7 +3,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - public interface IRuntimeTargetExtension + public interface ICodeTargetExtension { } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IDesignTimeDirectiveTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IDesignTimeDirectiveTargetExtension.cs index a8c38ef76d..8a5a679e5d 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IDesignTimeDirectiveTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IDesignTimeDirectiveTargetExtension.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - internal interface IDesignTimeDirectiveTargetExtension : IRuntimeTargetExtension + internal interface IDesignTimeDirectiveTargetExtension : ICodeTargetExtension { void WriteDesignTimeDirective(CSharpRenderingContext context, DesignTimeDirectiveIRNode node); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IPreallocatedAttributeTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IPreallocatedAttributeTargetExtension.cs index 529a01281a..0d87a23360 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IPreallocatedAttributeTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/IPreallocatedAttributeTargetExtension.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - internal interface IPreallocatedAttributeTargetExtension : IRuntimeTargetExtension + internal interface IPreallocatedAttributeTargetExtension : ICodeTargetExtension { void WriteDeclarePreallocatedTagHelperHtmlAttribute(CSharpRenderingContext context, DeclarePreallocatedTagHelperHtmlAttributeIRNode node); diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ITemplateTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ITemplateTargetExtension.cs index 61f64c92db..756760f317 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ITemplateTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/ITemplateTargetExtension.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - internal interface ITemplateTargetExtension : IRuntimeTargetExtension + internal interface ITemplateTargetExtension : ICodeTargetExtension { void WriteTemplate(CSharpRenderingContext context, TemplateIRNode node); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpLoweringPhase.cs index 1634405947..8e23fd642b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCSharpLoweringPhase.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language { var message = Resources.FormatDocumentMissingTarget( irDocument.DocumentKind, - nameof(RuntimeTarget), + nameof(CodeTarget), nameof(DocumentIRNode.Target)); throw new InvalidOperationException(message); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTargetExtensionFeature.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTargetExtensionFeature.cs index 677a3a904c..cccf0f567a 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTargetExtensionFeature.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTargetExtensionFeature.cs @@ -10,6 +10,6 @@ namespace Microsoft.AspNetCore.Razor.Language { public RazorEngine Engine { get; set; } - public ICollection TargetExtensions { get; } = new List(); + public ICollection TargetExtensions { get; } = new List(); } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs b/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs index a63996bd3f..6febbf203f 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs @@ -10,11 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language { public abstract class DocumentClassifierPassBase : RazorIRPassBase, IRazorDocumentClassifierPass { - private static readonly IRuntimeTargetExtension[] EmptyExtensionArray = new IRuntimeTargetExtension[0]; + private static readonly ICodeTargetExtension[] EmptyExtensionArray = new ICodeTargetExtension[0]; protected abstract string DocumentKind { get; } - protected IRuntimeTargetExtension[] TargetExtensions { get; private set; } + protected ICodeTargetExtension[] TargetExtensions { get; private set; } protected override void OnIntialized() { @@ -82,9 +82,9 @@ namespace Microsoft.AspNetCore.Razor.Language protected abstract bool IsMatch(RazorCodeDocument codeDocument, DocumentIRNode irDocument); - private RuntimeTarget CreateTarget(RazorCodeDocument codeDocument, RazorParserOptions options) + private CodeTarget CreateTarget(RazorCodeDocument codeDocument, RazorParserOptions options) { - return RuntimeTarget.CreateDefault(codeDocument, options, (builder) => + return CodeTarget.CreateDefault(codeDocument, options, (builder) => { for (var i = 0; i < TargetExtensions.Length; i++) { @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Language }); } - protected virtual void ConfigureTarget(IRuntimeTargetBuilder builder) + protected virtual void ConfigureTarget(ICodeTargetBuilder builder) { // Intentionally empty. } diff --git a/src/Microsoft.AspNetCore.Razor.Language/IRazorTargetExtensionFeature.cs b/src/Microsoft.AspNetCore.Razor.Language/IRazorTargetExtensionFeature.cs index 5ed38f8bbf..33f30c8193 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/IRazorTargetExtensionFeature.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/IRazorTargetExtensionFeature.cs @@ -8,6 +8,6 @@ namespace Microsoft.AspNetCore.Razor.Language { public interface IRazorTargetExtensionFeature : IRazorEngineFeature { - ICollection TargetExtensions { get; } + ICollection TargetExtensions { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs index 41ee1c406e..37489f1e1a 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddPreallocatedTagHelperHtmlAttributeIRNode.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { var extension = target.GetExtension(); extension.WriteAddPreallocatedTagHelperHtmlAttribute(context, this); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs index 522c73f69d..b0220d3dd4 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIRNode.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { var extension = target.GetExtension(); extension.WriteDeclarePreallocatedTagHelperAttribute(context, this); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs index 2c8af38094..300dc0e4c6 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIRNode.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { var extension = target.GetExtension(); extension.WriteDeclarePreallocatedTagHelperHtmlAttribute(context, this); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs index 46c8fec9be..eeaab774b4 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DesignTimeDirectiveIRNode.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { var extension = target.GetExtension(); extension.WriteDesignTimeDirective(context, this); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIRNode.cs index bb32972443..4a0afc1774 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DocumentIRNode.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public override SourceSpan? Source { get; set; } - public RuntimeTarget Target { get; set; } + public CodeTarget Target { get; set; } public override void Accept(RazorIRNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs index a6537e9353..6e50018929 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/ExtensionIRNode.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate } } - public abstract void WriteNode(RuntimeTarget target, CSharpRenderingContext context); + public abstract void WriteNode(CodeTarget target, CSharpRenderingContext context); protected static void AcceptExtensionNode(TNode node, RazorIRNodeVisitor visitor) where TNode : ExtensionIRNode diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs index a764bdec24..e52e3496fe 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { var extension = target.GetExtension(); extension.WriteSetPreallocatedTagHelperProperty(context, this); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TemplateIRNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TemplateIRNode.cs index 52bbbbfb60..ab17801440 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TemplateIRNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/TemplateIRNode.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { var extension = target.GetExtension(); extension.WriteTemplate(context, this); diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorEngineBuilderExtensions.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorEngineBuilderExtensions.cs index 9c0ac78c61..9b9511e291 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorEngineBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorEngineBuilderExtensions.cs @@ -38,12 +38,12 @@ namespace Microsoft.AspNetCore.Razor.Language } /// - /// Adds the specified . + /// Adds the specified . /// /// The . - /// The to add. + /// The to add. /// The . - public static IRazorEngineBuilder AddTargetExtension(this IRazorEngineBuilder builder, IRuntimeTargetExtension extension) + public static IRazorEngineBuilder AddTargetExtension(this IRazorEngineBuilder builder, ICodeTargetExtension extension) { if (builder == null) { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeTargetTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CodeTargetTest.cs similarity index 72% rename from test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeTargetTest.cs rename to test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CodeTargetTest.cs index c801144322..9f4f371ce7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeTargetTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/CodeTargetTest.cs @@ -6,20 +6,20 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - public class RuntimeTargetTest + public class CodeTargetTest { [Fact] - public void CreateDefault_CreatesDefaultRuntimeTarget() + public void CreateDefault_CreatesDefaultCodeTarget() { // Arrange var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); // Act - var target = RuntimeTarget.CreateDefault(codeDocument, options); + var target = CodeTarget.CreateDefault(codeDocument, options); // Assert - Assert.IsType(target); + Assert.IsType(target); } [Fact] @@ -27,13 +27,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { // Arrange var wasCalled = false; - Action @delegate = (b) => { wasCalled = true; }; + Action @delegate = (b) => { wasCalled = true; }; var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); // Act - RuntimeTarget.CreateDefault(codeDocument, options, @delegate); + CodeTarget.CreateDefault(codeDocument, options, @delegate); // Assert Assert.True(wasCalled); @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var options = RazorParserOptions.CreateDefaultOptions(); // Act - RuntimeTarget.CreateDefault(codeDocument, options, configure: null); + CodeTarget.CreateDefault(codeDocument, options, configure: null); // Assert (does not throw) } @@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var options = RazorParserOptions.CreateDefaultOptions(); // Act - RuntimeTarget.CreateDefault(codeDocument, options, configure: null); + CodeTarget.CreateDefault(codeDocument, options, configure: null); // Assert (does not throw) } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultRuntimeTargetBuilderTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetBuilderTest.cs similarity index 67% rename from test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultRuntimeTargetBuilderTest.cs rename to test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetBuilderTest.cs index b750d849db..3600e81397 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultRuntimeTargetBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetBuilderTest.cs @@ -5,18 +5,18 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - public class DefaultRuntimeTargetBuilderTest + public class DefaultCodeTargetBuilderTest { [Fact] - public void Build_CreatesDefaultRuntimeTarget() + public void Build_CreatesDefaultCodeTarget() { // Arrange var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); - var builder = new DefaultRuntimeTargetBuilder(codeDocument, options); + var builder = new DefaultCodeTargetBuilder(codeDocument, options); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension1(), new MyExtension2(), @@ -31,15 +31,15 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var result = builder.Build(); // Assert - var target = Assert.IsType(result); + var target = Assert.IsType(result); Assert.Equal(extensions, target.Extensions); } - private class MyExtension1 : IRuntimeTargetExtension + private class MyExtension1 : ICodeTargetExtension { } - private class MyExtension2 : IRuntimeTargetExtension + private class MyExtension2 : ICodeTargetExtension { } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultRuntimeTargetTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetTest.cs similarity index 76% rename from test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultRuntimeTargetTest.cs rename to test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetTest.cs index 4d02e89a7e..f45cf6d135 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultRuntimeTargetTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultCodeTargetTest.cs @@ -6,7 +6,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { - public class DefaultRuntimeTargetTest + public class DefaultCodeTargetTest { [Fact] public void Constructor_CreatesDefensiveCopy() @@ -14,14 +14,14 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension2(), new MyExtension1(), }; // Act - var target = new DefaultRuntimeTarget(options, extensions); + var target = new DefaultCodeTarget(options, extensions); // Assert Assert.NotSame(extensions, target); @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var target = new DefaultRuntimeTarget(options, Enumerable.Empty()); + var target = new DefaultCodeTarget(options, Enumerable.Empty()); // Act var writer = target.CreateWriter(new CSharpRenderingContext()); @@ -48,13 +48,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension2(), new MyExtension1(), }; - var target = new DefaultRuntimeTarget(options, extensions); + var target = new DefaultCodeTarget(options, extensions); // Act var result = target.HasExtension(); @@ -69,13 +69,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension2(), new MyExtension2(), }; - var target = new DefaultRuntimeTarget(options, extensions); + var target = new DefaultCodeTarget(options, extensions); // Act var result = target.HasExtension(); @@ -90,13 +90,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension2(), new MyExtension1(), }; - var target = new DefaultRuntimeTarget(options, extensions); + var target = new DefaultCodeTarget(options, extensions); // Act var result = target.GetExtension(); @@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension2(), new MyExtension1(), @@ -119,7 +119,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration new MyExtension1(), }; - var target = new DefaultRuntimeTarget(options, extensions); + var target = new DefaultCodeTarget(options, extensions); // Act var result = target.GetExtension(); @@ -135,13 +135,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration // Arrange var options = RazorParserOptions.CreateDefaultOptions(); - var extensions = new IRuntimeTargetExtension[] + var extensions = new ICodeTargetExtension[] { new MyExtension2(), new MyExtension2(), }; - var target = new DefaultRuntimeTarget(options, extensions); + var target = new DefaultCodeTarget(options, extensions); // Act var result = target.GetExtension(); @@ -150,11 +150,11 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration Assert.Null(result); } - private class MyExtension1 : IRuntimeTargetExtension + private class MyExtension1 : ICodeTargetExtension { } - private class MyExtension2 : IRuntimeTargetExtension + private class MyExtension2 : ICodeTargetExtension { } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs index 39e57283c4..dc99f89074 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DefaultDocumentWriterTest.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); - var target = RuntimeTarget.CreateDefault(codeDocument, options); + var target = CodeTarget.CreateDefault(codeDocument, options); var context = new CSharpRenderingContext() { Options = options, @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); - var target = RuntimeTarget.CreateDefault(codeDocument, options); + var target = CodeTarget.CreateDefault(codeDocument, options); var context = new CSharpRenderingContext() { Options = options, @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); - var target = RuntimeTarget.CreateDefault(codeDocument, options); + var target = CodeTarget.CreateDefault(codeDocument, options); var context = new CSharpRenderingContext() { Options = options, @@ -137,7 +137,7 @@ internal virtual async string TestMethod() var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); - var target = RuntimeTarget.CreateDefault(codeDocument, options); + var target = CodeTarget.CreateDefault(codeDocument, options); var context = new CSharpRenderingContext() { Options = options, @@ -175,7 +175,7 @@ internal virtual async string TestMethod() var codeDocument = TestRazorCodeDocument.CreateEmpty(); var options = RazorParserOptions.CreateDefaultOptions(); - var target = RuntimeTarget.CreateDefault(codeDocument, options); + var target = CodeTarget.CreateDefault(codeDocument, options); var context = new CSharpRenderingContext() { Options = options, diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs index 57036eb58d..cdb41fa265 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs @@ -417,7 +417,7 @@ if (true) { } throw new NotImplementedException(); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { throw new NotImplementedException(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs index 6497c7ef0c..1edcc08c36 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs @@ -655,7 +655,7 @@ WriteAttributeValue("" "", 27, false, 28, 6, false); throw new NotImplementedException(); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { throw new NotImplementedException(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCSharpLoweringPhaseTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCSharpLoweringPhaseTest.cs index 22fed80283..405cb56172 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCSharpLoweringPhaseTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorCSharpLoweringPhaseTest.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Language } [Fact] - public void Execute_ThrowsForMissingDependency_RuntimeTarget() + public void Execute_ThrowsForMissingDependency_CodeTarget() { // Arrange var phase = new DefaultRazorCSharpLoweringPhase(); @@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Razor.Language // Act & Assert ExceptionAssert.Throws( () => phase.Execute(codeDocument), - $"The document of kind 'test' does not have a '{nameof(RuntimeTarget)}'. " + + $"The document of kind 'test' does not have a '{nameof(CodeTarget)}'. " + $"The document classifier must set a value for '{nameof(DocumentIRNode.Target)}'."); } @@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Razor.Language var irDocument = new DocumentIRNode() { DocumentKind = "test", - Target = RuntimeTarget.CreateDefault(codeDocument, options), + Target = CodeTarget.CreateDefault(codeDocument, options), Options = options, }; codeDocument.SetIRDocument(irDocument); @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language var irDocument = new DocumentIRNode() { DocumentKind = "test", - Target = RuntimeTarget.CreateDefault(codeDocument, options), + Target = CodeTarget.CreateDefault(codeDocument, options), Options = options, }; codeDocument.SetIRDocument(irDocument); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs index bfc18d9460..863522173b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Razor.Language Options = RazorParserOptions.CreateDefaultOptions(), }; - var expected = new IRuntimeTargetExtension[] + var expected = new ICodeTargetExtension[] { new MyExtension1(), new MyExtension2(), @@ -81,9 +81,9 @@ namespace Microsoft.AspNetCore.Razor.Language } }); - IRuntimeTargetExtension[] extensions = null; + ICodeTargetExtension[] extensions = null; - pass.RuntimeTargetCallback = (builder) => extensions = builder.TargetExtensions.ToArray(); + pass.CodeTargetCallback = (builder) => extensions = builder.TargetExtensions.ToArray(); // Act pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument); @@ -300,7 +300,7 @@ namespace Microsoft.AspNetCore.Razor.Language public bool ShouldMatch { get; set; } = true; - public Action RuntimeTargetCallback { get; set; } + public Action CodeTargetCallback { get; set; } public string Namespace { get; set; } @@ -326,17 +326,17 @@ namespace Microsoft.AspNetCore.Razor.Language @method.Name = Method; } - protected override void ConfigureTarget(IRuntimeTargetBuilder builder) + protected override void ConfigureTarget(ICodeTargetBuilder builder) { - RuntimeTargetCallback?.Invoke(builder); + CodeTargetCallback?.Invoke(builder); } } - private class MyExtension1 : IRuntimeTargetExtension + private class MyExtension1 : ICodeTargetExtension { } - private class MyExtension2 : IRuntimeTargetExtension + private class MyExtension2 : ICodeTargetExtension { } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs index 69b3d08781..a7932d2a90 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Intermediate/ExtensionIRNodeTest.cs @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate AcceptExtensionNode(this, visitor); } - public override void WriteNode(RuntimeTarget target, CSharpRenderingContext context) + public override void WriteNode(CodeTarget target, CSharpRenderingContext context) { throw new NotImplementedException(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineBuilderExtensionsTest.cs index 3c054dc5ed..c2ba72b477 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineBuilderExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/RazorEngineBuilderExtensionsTest.cs @@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Language Assert.Same(extension, Assert.Single(actual.TargetExtensions)); } - private class MyTargetExtension : IRuntimeTargetExtension + private class MyTargetExtension : ICodeTargetExtension { } }