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

Match component childcontent tag helper from a different namespace (dotnet/aspnetcore-tooling#390) 

\n\nCommit migrated from 8a815a1882
This commit is contained in:
Ajay Bhargav Baaskaran 2019-04-05 16:00:29 -07:00 committed by GitHub
parent 5b71a24b4f
commit 35edb562c5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
View File

@ -334,6 +334,12 @@ namespace Microsoft.AspNetCore.Razor.Language
} }
var typeName = tagHelper.GetTypeName(); var typeName = tagHelper.GetTypeName();
if (tagHelper.IsChildContentTagHelper())
{
// If this is a child content tag helper, we want to add it if it's original type is in scope of the given namespace.
// E.g, if the type name is `Test.MyComponent.ChildContent`, we want to add it if `Test.MyComponent` is in this namespace.
TrySplitNamespaceAndType(typeName, out typeName, out var _);
}
if (typeName != null && IsTypeInNamespace(typeName, @namespace)) if (typeName != null && IsTypeInNamespace(typeName, @namespace))
{ {
// If the type is at the top-level or if the type's namespace matches the using's namespace, add it. // If the type is at the top-level or if the type's namespace matches the using's namespace, add it.
@ -390,7 +396,14 @@ namespace Microsoft.AspNetCore.Razor.Language
// open file in the editor. We mangle the class name for its generated code, so using that here to filter these out. // open file in the editor. We mangle the class name for its generated code, so using that here to filter these out.
internal static bool IsTagHelperFromMangledClass(TagHelperDescriptor tagHelper) internal static bool IsTagHelperFromMangledClass(TagHelperDescriptor tagHelper)
{ {
if (!TrySplitNamespaceAndType(tagHelper.GetTypeName(), out var _, out var className)) var typeName = tagHelper.GetTypeName();
if (tagHelper.IsChildContentTagHelper())
{
// If this is a child content tag helper, we want to look at it's original type.
// E.g, if the type name is `Test.__generated__MyComponent.ChildContent`, we want to look at `Test.__generated__MyComponent`.
TrySplitNamespaceAndType(typeName, out typeName, out var _);
}
if (!TrySplitNamespaceAndType(typeName, out var _, out var className))
{ {
return false; return false;
} }