Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width.

src/Umbraco.Web/Models/Mapping/MacroModelMapper.cs

@@ -1,9 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Mapping;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Mapping
@@ -24,7 +26,8 @@ namespace Umbraco.Web.Models.Mapping
             config.CreateMap<IMacro, IEnumerable<MacroParameter>>()
                     .ConvertUsing(macro => macro.Properties.Select(Mapper.Map<MacroParameter>).ToList());
 
-            config.CreateMap<IMacroProperty, MacroParameter>();
+            config.CreateMap<IMacroProperty, MacroParameter>()
+                  .ForMember(parameter => parameter.View, expression => expression.ResolveUsing<ParameterEditorViewResolver>());
 
         }
 

src/Umbraco.Web/Models/Mapping/ParameterEditorViewResolver.cs

@@ -0,0 +1,20 @@
+using System;
+using AutoMapper;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    internal class ParameterEditorViewResolver : ValueResolver<IMacroProperty, string>
+    {
+        protected override string ResolveCore(IMacroProperty source)
+        {
+            var paramEditor = ParameterEditorResolver.Current.GetByAlias(source.EditorAlias);
+            if (paramEditor == null)
+            {
+                throw new InvalidOperationException("Could not resolve macro parameter editor: " + source.EditorAlias);
+            }
+            return paramEditor.ValueEditor.View;
+        }
+    }
+}