Ignore Enrich.With<> / With(params) since it cannot be expressed in c…

…onfig
Suchiman · Sep 20, 2016 · 5945d6f · 5945d6f
1 parent 4a6ac6b
commit 5945d6f
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 0 deletions.
diff --git a/SerilogAnalyzer/SerilogAnalyzer.Test/RefactoringTests.cs b/SerilogAnalyzer/SerilogAnalyzer.Test/RefactoringTests.cs
@@ -598,6 +598,72 @@ public object GetFormat(Type formatType)
     {
         return null;
     }
+}";
+            VerifyCSharpRefactoring(test, fixtest, "Show appsettings.json config");
+        }
+
+        [TestMethod]
+        public void TestEnrichWithEnricher()
+        {
+            var test = @"
+using Serilog;
+using System;
+
+class TypeName
+{
+    public static void Test()
+    {
+        ILogger test = [|new LoggerConfiguration()
+            .Enrich.With(null)
+            .CreateLogger()|];
+    }
+}";
+
+            var fixtest = @"
+using Serilog;
+using System;
+
+class TypeName
+{
+    public static void Test()
+    {
+        ILogger test = new LoggerConfiguration()
+            .Enrich.With(null)
+            .CreateLogger();
+    }
+}";
+            VerifyCSharpRefactoring(test, fixtest, "Show appsettings.json config");
+        }
+
+        [TestMethod]
+        public void TestEnrichWithGenericEnricher()
+        {
+            var test = @"
+using Serilog;
+using System;
+
+class TypeName
+{
+    public static void Test()
+    {
+        ILogger test = [|new LoggerConfiguration()
+            .Enrich.With<Test>()
+            .CreateLogger()|];
+    }
+}";
+
+            var fixtest = @"
+using Serilog;
+using System;
+
+class TypeName
+{
+    public static void Test()
+    {
+        ILogger test = new LoggerConfiguration()
+            .Enrich.With<Test>()
+            .CreateLogger();
+    }
 }";
             VerifyCSharpRefactoring(test, fixtest, "Show appsettings.json config");
         }

diff --git a/SerilogAnalyzer/SerilogAnalyzer/CodeRefactoringProvider.cs b/SerilogAnalyzer/SerilogAnalyzer/CodeRefactoringProvider.cs
@@ -192,6 +192,11 @@ private static LoggerConfiguration GetLoggerConfigurationFromSyntax(CodeRefactor
                             configuration.EnrichWithProperty[key] = value;
                         }
                     }
+                    else if (((invokedMethod.Name as GenericNameSyntax)?.Identifier.ToString() ?? invokedMethod.Name.ToString()) == "With")
+                    {
+                        // configuration cannot express Enrich.With(new SomeEnricher()) or Enrich.With<SomeEnricher>()
+                        continue;
+                    }
                     else
                     {
                         var method = GetExtensibleMethod(semanticModel, invokedMethod, context.CancellationToken);