Ignore member order on ReadonlyFieldAnalyzer

Fix code-cracker#812 Add constructor to the top of the list so we add fields with constructors initializers first
kindermannhubert · Aug 19, 2016 · b40843e · b40843e
1 parent 01ee962
commit b40843e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/CSharp/CodeCracker/Usage/ReadonlyFieldAnalyzer.cs b/src/CSharp/CodeCracker/Usage/ReadonlyFieldAnalyzer.cs
@@ -36,6 +36,19 @@ private static void AnalyzeCompilation(CompilationStartAnalysisContext compilati
             compilationStartAnalysisContext.RegisterSyntaxTreeAction(context => AnalyzeTree(context, compilation));
         }
 
+        private struct MethodKindComparer : IComparer<MethodKind>
+        {
+            public int Compare(MethodKind x, MethodKind y) =>
+                x - y == 0
+                ? 0
+                : (x == MethodKind.Constructor
+                    ? 1
+                    : (y == MethodKind.Constructor
+                        ? -1
+                        : x - y));
+        }
+        private static readonly MethodKindComparer methodKindComparer = new MethodKindComparer();
+
         private static void AnalyzeTree(SyntaxTreeAnalysisContext context, Compilation compilation)
         {
             if (context.IsGenerated()) return;
@@ -51,6 +64,7 @@ private static void AnalyzeTree(SyntaxTreeAnalysisContext context, Compilation c
                 var typeSymbol = semanticModel.GetDeclaredSymbol(type);
                 if (typeSymbol == null) continue;
                 var methods = typeSymbol.GetAllMethodsIncludingFromInnerTypes();
+                methods = methods.OrderByDescending(m => m.MethodKind, methodKindComparer).ToList();
                 foreach (var method in methods)
                 {
                     foreach (var syntaxReference in method.DeclaringSyntaxReferences)

diff --git a/test/CSharp/CodeCracker.Test/Usage/ReadonlyFieldTests.cs b/test/CSharp/CodeCracker.Test/Usage/ReadonlyFieldTests.cs
@@ -967,5 +967,29 @@ public Person(string name)
             };
             await VerifyCSharpDiagnosticAsync(source, expected);
         }
+
+        [Fact]
+        public async Task IgnoreWhenConstructorIsTheLastMember()
+        {
+            const string source = @"
+class Test
+{
+    private int value;
+    public int Value
+    {
+        get { return value; }
+        set { this.value = value; }
+    }
+    public void Foo()
+    {
+        value = 1;
+    }
+    public Test()
+    {
+        value = 8;
+    }
+}";
+            await VerifyCSharpHasNoDiagnosticsAsync(source);
+        }
     }
 }