More tests.

Author: JohanLarsson

ValidCode/RoutedEvents/RoutedEventHelper.cs

@@ -0,0 +1,19 @@
+namespace ValidCode.RoutedEvents;
+
+using System;
+using System.Windows;
+
+internal static class RoutedEventHelper
+{
+    internal static void UpdateHandler(this UIElement element, RoutedEvent routedEvent, Delegate handler)
+    {
+        element.RemoveHandler(routedEvent, handler);
+        element.AddHandler(routedEvent, handler);
+    }
+
+    internal static void UpdateHandler(this UIElement element, RoutedEvent routedEvent, Delegate handler, bool handledEventsToo)
+    {
+        element.RemoveHandler(routedEvent, handler);
+        element.AddHandler(routedEvent, handler, handledEventsToo);
+    }
+}

ValidCode/RoutedEvents/WithCustomEventHandler.cs

@@ -21,3 +21,4 @@ public event ValueChangedEventHandler ValueChanged
         }
     }
 }
+

WpfAnalyzers.Test/ReproBox.cs

@@ -20,7 +20,8 @@ public static class ReproBox
                             .ToArray();
 
     private static readonly Solution Solution = CodeFactory.CreateSolution(
-        new FileInfo("C:\\Git\\_GuOrg\\Gu.Wpf.DataGrid2D\\Gu.Wpf.DataGrid2D\\Gu.Wpf.DataGrid2D.csproj"));
+        new FileInfo("C:\\Git\\_GuOrg\\Gu.Wpf.DataGrid2D\\Gu.Wpf.DataGrid2D\\Gu.Wpf.DataGrid2D.csproj"),
+        Settings.Default.WithCompilationOptions(Settings.Default.CompilationOptions.WithSuppressedDiagnostics("CS8019", "CS8602", "CS8603", "CS8604", "CS8622", "CS8765")));
 
     [TestCaseSource(nameof(AllAnalyzers))]
     public static void SolutionRepro(DiagnosticAnalyzer analyzer)
@@ -35,7 +36,6 @@ public static void Repro(DiagnosticAnalyzer analyzer)
 namespace N
 {
     using System;
-    using Window = System.Windows.Window;
 
     class C
     {

WpfAnalyzers.Test/WPF0091AddAndRemoveHandlerCallbackNameShouldMatchEventTests/Valid.cs

@@ -205,6 +205,32 @@ private static void OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
             throw new System.NotImplementedException();
         }
     }
+}";
+        RoslynAssert.Valid(Analyzer, code);
+    }
+
+    [Test]
+    public static void RoutedEventHelper()
+    {
+        var code = @"
+namespace ValidCode.RoutedEvents;
+
+using System;
+using System.Windows;
+
+internal static class RoutedEventHelper
+{
+    internal static void UpdateHandler(this UIElement element, RoutedEvent routedEvent, Delegate handler)
+    {
+        element.RemoveHandler(routedEvent, handler);
+        element.AddHandler(routedEvent, handler);
+    }
+
+    internal static void UpdateHandler(this UIElement element, RoutedEvent routedEvent, Delegate handler, bool handledEventsToo)
+    {
+        element.RemoveHandler(routedEvent, handler);
+        element.AddHandler(routedEvent, handler, handledEventsToo);
+    }
 }";
         RoslynAssert.Valid(Analyzer, code);
     }

WpfAnalyzers.Test/WPF0092RegisterClassHandlerDelegateType/Valid.cs

@@ -89,6 +89,32 @@ public event RoutedEventHandler ValueChanged
         add { this.AddHandler(ValueChangedEvent, value); }
         remove { this.RemoveHandler(ValueChangedEvent, value); }
     }
+}";
+        RoslynAssert.Valid(Analyzer, code);
+    }
+
+    [Test]
+    public static void RoutedEventHelper()
+    {
+        var code = @"
+namespace ValidCode.RoutedEvents;
+
+using System;
+using System.Windows;
+
+internal static class RoutedEventHelper
+{
+    internal static void UpdateHandler(this UIElement element, RoutedEvent routedEvent, Delegate handler)
+    {
+        element.RemoveHandler(routedEvent, handler);
+        element.AddHandler(routedEvent, handler);
+    }
+
+    internal static void UpdateHandler(this UIElement element, RoutedEvent routedEvent, Delegate handler, bool handledEventsToo)
+    {
+        element.RemoveHandler(routedEvent, handler);
+        element.AddHandler(routedEvent, handler, handledEventsToo);
+    }
 }";
         RoslynAssert.Valid(Analyzer, code);
     }

WpfAnalyzers/Analyzers/RoutedEventCallbackAnalyzer.cs

@@ -117,10 +117,10 @@ private static void Handle(SyntaxNodeAnalysisContext context)
                 {
                     return callbackArg switch
                     {
-                        { Expression: IdentifierNameSyntax { Identifier.ValueText: "value" } } => null,
                         { Expression: ObjectCreationExpressionSyntax { ArgumentList.Arguments: { Count: 1 } arguments } }
-                            => Identifier(arguments[0].Expression),
-                        _ => Identifier(callbackArg.Expression),
+                            when arguments[0].Expression is IdentifierNameSyntax name
+                            => name,
+                        _ => null,
                     };
                 }