Allow command duffix in memmebr name.

Fix #355

Author: JohanLarsson

ValidCode/Commands.cs

@@ -6,6 +6,8 @@ namespace ValidCode
     public static class Commands
     {
         public static readonly RoutedCommand Command1 = new(nameof(Command1), typeof(Commands));
+        public static readonly RoutedCommand ShowSystemMenuCommand = new("ShowSystemMenu", typeof(Commands));
+
         public static readonly RoutedUICommand Command2 = new("Some text", nameof(Command2), typeof(Commands));
 #pragma warning disable WPF0150 // Use nameof().
         public static readonly RoutedCommand Command3 = new("Command3", typeof(Commands));

WpfAnalyzers.Test/WPF0120RegisterContainingMemberAsNameForRoutedCommandTests/Valid.cs

@@ -8,21 +8,38 @@ public static class Valid
         private static readonly RoutedCommandCreationAnalyzer Analyzer = new();
 
         [Test]
-        public static void RoutedCommand()
+        public static void RoutedCommandNameOf()
         {
             var code = @"
 namespace N
 {
     using System.Windows.Input;
 
-    public static class Foo
+    public static class C
     {
-        public static readonly RoutedCommand Bar = new RoutedCommand(nameof(Bar), typeof(Foo));
+        public static readonly RoutedCommand F = new RoutedCommand(nameof(F), typeof(C));
     }
 }";
             RoslynAssert.Valid(Analyzer, code);
         }
 
+        [TestCase("F")]
+        [TestCase("FCommand")]
+        public static void RoutedCommandLiteralName(string fieldName)
+        {
+            var code = @"
+namespace N
+{
+    using System.Windows.Input;
+
+    public static class C
+    {
+        public static readonly RoutedCommand F = new RoutedCommand(""F"", typeof(C));
+    }
+}".AssertReplace("public static readonly RoutedCommand F", $"public static readonly RoutedCommand {fieldName}");
+            RoslynAssert.Valid(Analyzer, Descriptors.WPF0120RegisterContainingMemberAsNameForRoutedCommand, code);
+        }
+
         [Test]
         public static void RoutedUICommand()
         {
@@ -31,9 +48,9 @@ namespace N
 {
     using System.Windows.Input;
 
-    public static class Foo
+    public static class C
     {
-        public static readonly RoutedUICommand Bar = new RoutedUICommand(""Some text"", nameof(Bar), typeof(Foo));
+        public static readonly RoutedUICommand F = new RoutedUICommand(""Some text"", nameof(F), typeof(C));
     }
 }";
             RoslynAssert.Valid(Analyzer, code);

WpfAnalyzers/Analyzers/RoutedCommandCreationAnalyzer.cs

@@ -57,7 +57,8 @@ context.ContainingSymbol is { } containingSymbol &&
                         if (objectCreation.TryFindArgument(nameParameter, out var nameArg) &&
                             nameArg.TryGetStringValue(context.SemanticModel, context.CancellationToken, out var registeredName))
                         {
-                            if (registeredName != fieldOrProperty.Name)
+                            if (registeredName != fieldOrProperty.Name &&
+                                !fieldOrProperty.Name.IsParts(registeredName ?? string.Empty, "Command"))
                             {
                                 context.ReportDiagnostic(
                                     Diagnostic.Create(
@@ -66,23 +67,27 @@ context.ContainingSymbol is { } containingSymbol &&
                                         ImmutableDictionary<string, string?>.Empty.Add(nameof(IdentifierNameSyntax), fieldOrProperty.Name),
                                         fieldOrProperty.Name));
                             }
-                            else if (nameArg.Expression.IsKind(SyntaxKind.StringLiteralExpression))
-                            {
-                                context.ReportDiagnostic(
-                                    Diagnostic.Create(
-                                        Descriptors.WPF0150UseNameofInsteadOfLiteral,
-                                        nameArg.GetLocation(),
-                                        ImmutableDictionary<string, string?>.Empty.Add(nameof(IdentifierNameSyntax), fieldOrProperty.Name),
-                                        fieldOrProperty.Name));
-                            }
-                            else if (!nameArg.Expression.IsNameof())
+
+                            if (registeredName == fieldOrProperty.Name)
                             {
-                                context.ReportDiagnostic(
-                                    Diagnostic.Create(
-                                        Descriptors.WPF0151UseNameofInsteadOfConstant,
-                                        nameArg.GetLocation(),
-                                        ImmutableDictionary<string, string?>.Empty.Add(nameof(IdentifierNameSyntax), fieldOrProperty.Name),
-                                        fieldOrProperty.Name));
+                                if (nameArg.Expression.IsKind(SyntaxKind.StringLiteralExpression))
+                                {
+                                    context.ReportDiagnostic(
+                                        Diagnostic.Create(
+                                            Descriptors.WPF0150UseNameofInsteadOfLiteral,
+                                            nameArg.GetLocation(),
+                                            ImmutableDictionary<string, string?>.Empty.Add(nameof(IdentifierNameSyntax), fieldOrProperty.Name),
+                                            fieldOrProperty.Name));
+                                }
+                                else if (!nameArg.Expression.IsNameof())
+                                {
+                                    context.ReportDiagnostic(
+                                        Diagnostic.Create(
+                                            Descriptors.WPF0151UseNameofInsteadOfConstant,
+                                            nameArg.GetLocation(),
+                                            ImmutableDictionary<string, string?>.Empty.Add(nameof(IdentifierNameSyntax), fieldOrProperty.Name),
+                                            fieldOrProperty.Name));
+                                }
                             }
                         }
                     }