Fixed helper method bug

JDemler · JDemler · commit f24a0fd83d00 · 2017-07-31T07:27:01.000+02:00
diff --git a/Compiler/Introspection/RoslynIntrospector.cs b/Compiler/Introspection/RoslynIntrospector.cs
@@ -107,6 +107,17 @@ public INamedTypeSymbol GetLayoutHbsTemplate(string layoutName)
 			return FindClassesWithNameAndAttribute(layoutName, StringConstants.LAYOUTATTRIBUTEFULL, StringConstants.LAYOUTATTRIBUTE);
 		}
 
+		/// <summary>
+		/// Finds a class with a certain name and attribute
+		/// Used to find layouts and partial templates
+		/// 
+		/// Alas we have to check against both the full and the nonfull attribute name because of inconsistencies in Roslyn
+		/// when working with asp.net core projects
+		/// </summary>
+		/// <param name="fullName"></param>
+		/// <param name="attributeFull"></param>
+		/// <param name="attribute"></param>
+		/// <returns></returns>
 		private INamedTypeSymbol FindClassesWithNameAndAttribute(string fullName, string attributeFull, string attribute)
 		{
 			var name = fullName.Split('.').Last();
@@ -142,7 +153,11 @@ public IMethodSymbol GetHelperMethod(string funtionName, List<ITypeSymbol> param
 				var candidates = comp.GetSymbolsWithName(x => x.Equals(funtionName))
 															 .OfType<IMethodSymbol>()
 															 .Where(x => x.IsStatic &&
-																			 x.GetAttributes().Any(y => y.AttributeClass.Name.Equals(StringConstants.HELPERMETHODATTRIBUTEFULL)));
+															 // The check for both HelperMethodAttribute and HelperMethodAttributeFull because when loading a asp.net core project
+															 // we the attribute name is HelpermethodAttribute while when loading a .net framework project the attribute name is
+															 // HelperMethodAttribute
+																			 x.GetAttributes().Any(y => y.AttributeClass.Name.Equals(StringConstants.HELPERMETHODATTRIBUTEFULL)
+																											 || y.AttributeClass.Name.Equals(StringConstants.HELPERMETHODATTRIBUTE)));
 				var helperMethod = candidates.FirstOrDefault(x => DoParametersMatch(x, parameters));
 				if (helperMethod != null)
 					return helperMethod;
diff --git a/Examples/AspDotNetCore/Startup.cs b/Examples/AspDotNetCore/Startup.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 using CompiledHandlebars.ViewEngine.Core;
 using System.Reflection;
+using CompiledHandlebars.RuntimeUtils;
 
 namespace AspDotNetCore
 {
@@ -47,5 +48,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 					 template: "{controller=Test}/{action=Index}/{id?}");
 			});
 		}
+
+		[CompiledHandlebarsHelperMethod]
+		public static string TestHelper(ViewModel vm)
+		{
+			return $"ViewModel(Name:{vm.Name})";
+		}
 	}
 }
diff --git a/Examples/AspDotNetCore/Template.hbs b/Examples/AspDotNetCore/Template.hbs
@@ -2,5 +2,6 @@
 <html>
 <body>
 	<h1>Hello {{Name}}!</h1>
+	<p>{{TestHelper .}}</p>
 </body>
 </html>
diff --git a/Examples/AspDotNetCore/Template.hbs.cs b/Examples/AspDotNetCore/Template.hbs.cs
@@ -16,7 +16,9 @@ public static string Render(AspDotNetCore.ViewModel viewModel)
 			var sb = new StringBuilder(64);
 			sb.Append("\r\n<html>\r\n<body>\r\n\t<h1>Hello ");
 			sb.Append(WebUtility.HtmlEncode(viewModel.Name));
-			sb.Append("!</h1>\r\n</body>\r\n</html>");
+			sb.Append("!</h1>\r\n\t<p>");
+			sb.Append(WebUtility.HtmlEncode(Startup.TestHelper(viewModel)));
+			sb.Append("</p>\r\n</body>\r\n</html>");
 			return sb.ToString();
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.Extensions.Logging;`
`10`	`10`	`using CompiledHandlebars.ViewEngine.Core;`
`11`	`11`	`using System.Reflection;`
	`12`	`+using CompiledHandlebars.RuntimeUtils;`
`12`	`13`
`13`	`14`	`namespace AspDotNetCore`
`14`	`15`	`{`
`@@ -47,5 +48,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`47`	`48`	`template: "{controller=Test}/{action=Index}/{id?}");`
`48`	`49`	`});`
`49`	`50`	`}`
	`51`	`+`
	`52`	`+ [CompiledHandlebarsHelperMethod]`
	`53`	`+ public static string TestHelper(ViewModel vm)`
	`54`	`+ {`
	`55`	`+ return $"ViewModel(Name:{vm.Name})";`
	`56`	`+ }`
`50`	`57`	`}`
`51`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ public static string Render(AspDotNetCore.ViewModel viewModel)`
`16`	`16`	`var sb = new StringBuilder(64);`
`17`	`17`	`sb.Append("\r\n<html>\r\n<body>\r\n\t<h1>Hello ");`
`18`	`18`	`sb.Append(WebUtility.HtmlEncode(viewModel.Name));`
`19`		`- sb.Append("!</h1>\r\n</body>\r\n</html>");`
	`19`	`+ sb.Append("!</h1>\r\n\t<p>");`
	`20`	`+ sb.Append(WebUtility.HtmlEncode(Startup.TestHelper(viewModel)));`
	`21`	`+ sb.Append("</p>\r\n</body>\r\n</html>");`
`20`	`22`	`return sb.ToString();`
`21`	`23`	`}`
`22`	`24`	`}`