Skip to content
This repository was archived by the owner on Dec 19, 2018. It is now read-only.

Commit 10976b8

Browse files
author
NTaylorMullen
committed
Addressed code review comments.
1 parent 231ef61 commit 10976b8

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Microsoft.AspNet.Razor.Runtime/Resources.resx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="TagHelperDescriptorResolver_InvalidTagHelperLookupText" xml:space="preserve">
121-
<value>Invalid TagHelper lookup text '{0}'. The correct lookup text formats are:
120+
<data name="TagHelperDescriptorResolver_InvalidAddTagHelperLookupText" xml:space="preserve">
121+
<value>Invalid `@addtaghelper` lookup text '{0}'. The correct lookup text formats are:
122122
"assemblyName"
123123
"typeName, assemblyName"</value>
124124
</data>
125-
<data name="TagHelperTypeResolver_AssemblyNameCannotBeEmptyOrNull" xml:space="preserve">
126-
<value>Assembly name lookup text cannot be null or empty.</value>
125+
<data name="TagHelperTypeResolver_AddTagHelperAssemblyNameCannotBeEmptyOrNull" xml:space="preserve">
126+
<value>`@addtaghelper` assembly name cannot be null or empty.</value>
127127
</data>
128128
</root>

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
1111
{
1212
/// <summary>
13-
/// Defines a class that can be used to create <see cref="TagHelperDescriptor"/>s from <see cref="Type"/>s.
13+
/// Factory for <see cref="TagHelperDescriptor"/>s from <see cref="Type"/>s.
1414
/// </summary>
1515
public static class TagHelperDescriptorFactory
1616
{
1717
private const string TagHelperNameEnding = "TagHelper";
18-
private const ContentBehavior DefaultContentBehavior = ContentBehavior.None;
1918

2019
// TODO: Investigate if we should cache TagHelperDescriptors for types:
2120
// https://github.com/aspnet/Razor/issues/165
@@ -70,7 +69,7 @@ private static TagHelperAttributeDescriptor ToTagHelperAttributeDescriptor(Prope
7069
// TODO: Make the content behavior pull from a ContentBehaviorAttribute: https://github.com/aspnet/Razor/issues/122
7170
private static ContentBehavior GetContentBehavior(Type type)
7271
{
73-
return DefaultContentBehavior;
72+
return ContentBehavior.None;
7473
}
7574

7675
private static bool IsValidTagHelperProperty(PropertyInfo property)

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public IEnumerable<TagHelperDescriptor> Resolve(string lookupText)
3535
if (string.IsNullOrEmpty(lookupText))
3636
{
3737
throw new InvalidOperationException(
38-
Resources.FormatTagHelperDescriptorResolver_InvalidTagHelperLookupText(lookupText));
38+
Resources.FormatTagHelperDescriptorResolver_InvalidAddTagHelperLookupText(lookupText));
3939
}
4040

4141
var tagHelperTypes = ResolveTagHelperTypes(lookupText);
@@ -53,10 +53,10 @@ private IEnumerable<Type> ResolveTagHelperTypes(string lookupText)
5353
// Ensure that we have valid data to work with. Valid formats are:
5454
// "assemblyName"
5555
// "typeName, assemblyName"
56-
if (data.Length > 2)
56+
if (data.Length != 1 && data.Length != 2)
5757
{
5858
throw new InvalidOperationException(
59-
Resources.FormatTagHelperDescriptorResolver_InvalidTagHelperLookupText(lookupText));
59+
Resources.FormatTagHelperDescriptorResolver_InvalidAddTagHelperLookupText(lookupText));
6060
}
6161

6262
// Grab the assembly name from the lookup text data.

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public IEnumerable<Type> Resolve(string assemblyName)
3232
{
3333
if (string.IsNullOrEmpty(assemblyName))
3434
{
35-
throw new InvalidOperationException(Resources.TagHelperTypeResolver_AssemblyNameCannotBeEmptyOrNull);
35+
throw new InvalidOperationException(
36+
Resources.TagHelperTypeResolver_AddTagHelperAssemblyNameCannotBeEmptyOrNull);
3637
}
3738

3839
var assemblyRef = new AssemblyName(assemblyName);

test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ public void DescriptorResolver_ResolveThrowsIfNullOrEmptyLookupText(string looku
157157
new TagHelperDescriptorResolver(
158158
new TestTagHelperTypeResolver(InvalidTestableTagHelpers));
159159

160-
var expectedMessage = Resources.FormatTagHelperDescriptorResolver_InvalidTagHelperLookupText(lookupText);
160+
var expectedMessage =
161+
Resources.FormatTagHelperDescriptorResolver_InvalidAddTagHelperLookupText(lookupText);
161162

162163
// Act & Assert
163164
var ex = Assert.Throws<InvalidOperationException>(() =>

test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void TypeResolver_ResolveThrowsIfEmptyOrNullLookupText(string assemblyNam
6767
{
6868
// Arrange
6969
var tagHelperTypeResolver = new TestTagHelperTypeResolver(InvalidTestableTagHelpers);
70-
var expectedMessage = "Assembly name lookup text cannot be null or empty.";
70+
var expectedMessage = "`@addtaghelper` assembly name cannot be null or empty.";
7171

7272
// Act & Assert
7373
var ex = Assert.Throws<InvalidOperationException>(() =>

0 commit comments

Comments
 (0)