Generated code cleanup

Author: DerekGooding

SimpleViewModel/SimpleViewModel.csproj

@@ -9,7 +9,7 @@
 
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageId>SimpleViewModel</PackageId>
-	  <Version>0.9.6.1</Version>
+	  <Version>0.9.6.2</Version>
 	  <Authors>Derek Gooding</Authors>
 	  <Company>Derek Gooding</Company>
 	  <Description>

ViewModelGenerator/ViewModelGenerator.cs

@@ -71,14 +71,16 @@ public partial class {className} : BaseViewModel
                 var fieldName = ToPascal(field.Name);
 
                 viewModelBuilder.AppendLine(
-$@"        public {fieldType} {fieldName} {{ get => {field.Name}; set 
+$@"        public {fieldType} {fieldName} {{ get => {field.Name}; 
+                 set 
                 {{
                     SetProperty(ref {field.Name}, value);");
 
                 var onChange = GetOnChangeMethodName(field);
                     if (!string.IsNullOrWhiteSpace(onChange))
                         viewModelBuilder.AppendLine($"   {onChange}();");
                 viewModelBuilder.AppendLine("        }");
+                viewModelBuilder.AppendLine("    }");
             }
 
             foreach (var method in commandMethods)
@@ -112,9 +114,9 @@ public override void Execute(object? parameter)
 ");
                     var canExecute = GetCanExecuteMethodName(method);
                     if(!string.IsNullOrWhiteSpace(canExecute))
-                        viewModelBuilder.AppendLine($"        public override bool CanExecute(object? parameter) => vm.{canExecute}();");
-                    viewModelBuilder.AppendLine("    }");
-                    viewModelBuilder.AppendLine("}");
+                        commandBuilder.AppendLine($"        public override bool CanExecute(object? parameter) => vm.{canExecute}();");
+                    commandBuilder.AppendLine("    }");
+                    commandBuilder.AppendLine("}");
                     spc.AddSource($"{commandClassName}.g.cs", SourceText.From(commandBuilder.ToString(), Encoding.UTF8));
                 }