Fix for #9 (#10)

Author: ChrisPulman

src/ReactiveUI.SourceGenerators/ReactiveCommand/ReactiveCommandGenerator.Execute.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -29,7 +30,7 @@ public partial class ReactiveCommandGenerator
 {
     private const string RxCmd = "ReactiveUI.ReactiveCommand";
     private const string RxCmdAttribute = "ReactiveUI.SourceGenerators.ReactiveCommandAttribute";
-    private const string RxCmdProp = "Command { get; private set; }";
+    private const string RxCmdProp = " { get; private set; }";
 
     /// <summary>
     /// A container for all the logic for <see cref="ReactiveCommandGenerator"/>.
@@ -80,6 +81,7 @@ internal static CompilationUnitSyntax GetSyntax(CommandInfo commandInfo)
             {
                 var outputType = commandExtensionInfo.GetOutputTypeText();
                 var inputType = commandExtensionInfo.GetInputTypeText();
+                var commandName = GetGeneratedCommandName(commandExtensionInfo.MethodName);
 
                 writer.WriteLine(AttributeList(SingletonSeparatedList(
                         Attribute(IdentifierName("global::System.CodeDom.Compiler.GeneratedCode"))
@@ -88,7 +90,7 @@ internal static CompilationUnitSyntax GetSyntax(CommandInfo commandInfo)
                             AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ReactiveCommandGenerator).Assembly.GetName().Version.ToString())))))));
                 writer.WriteLine(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))));
 
-                writer.WriteLine($"{Token(SyntaxKind.PublicKeyword)} {RxCmd}<{inputType}, {outputType}>? {commandExtensionInfo.MethodName}{RxCmdProp}");
+                writer.WriteLine($"{Token(SyntaxKind.PublicKeyword)} {RxCmd}<{inputType}, {outputType}>? {commandName}{RxCmdProp}");
             }
 
             writer.WriteLine();
@@ -101,7 +103,7 @@ internal static CompilationUnitSyntax GetSyntax(CommandInfo commandInfo)
             // Add the command initialization
             foreach (var commandExtensionInfo in commandInfo.CommandExtensionInfos)
             {
-                var commandName = $"{commandExtensionInfo.MethodName}Command";
+                var commandName = GetGeneratedCommandName(commandExtensionInfo.MethodName);
                 var outputType = commandExtensionInfo.GetOutputTypeText();
                 var inputType = commandExtensionInfo.GetInputTypeText();
                 if (commandExtensionInfo.ArgumentType == null)
@@ -274,6 +276,8 @@ internal static void GetCommandInfoFromClass(ImmutableArrayBuilder<HierarchyInfo
                         out var fieldAttributes,
                         out var propertyAttributes);
 
+                    token.ThrowIfCancellationRequested();
+
                     commandExtensionInfos.Add(new(
                         methodSymbol.Name,
                         realReturnType,
@@ -600,5 +604,21 @@ static void GatherForwardedAttributes(
             fieldAttributes = fieldAttributesInfo.ToImmutable();
             propertyAttributes = propertyAttributesInfo.ToImmutable();
         }
+
+        private static string GetGeneratedCommandName(string methodName)
+        {
+            var commandName = methodName;
+
+            if (commandName.StartsWith("m_"))
+            {
+                commandName = commandName.Substring(2);
+            }
+            else if (commandName.StartsWith("_"))
+            {
+                commandName = commandName.TrimStart('_');
+            }
+
+            return $"{char.ToUpper(commandName[0], CultureInfo.InvariantCulture)}{commandName.Substring(1)}Command";
+        }
     }
 }