Implement and Test Property Get Set and Let Metrics

Author: Vogel612

RetailCoder.VBE/Navigation/CodeMetrics/ParseTreeMetricsAnalyst.cs

@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using Rubberduck.Parsing.VBA;
 using Antlr4.Runtime.Tree;
-using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
 using Antlr4.Runtime.Misc;
@@ -109,9 +105,7 @@ public override void EnterSubStmt([NotNull] VBAParser.SubStmtContext context)
             public override void ExitSubStmt([NotNull] VBAParser.SubStmtContext context)
             {
                 // well, we're done here
-                memberResults.Add(new MemberMetricsResult(currentMember, results));
-                results = new List<CodeMetricsResult>(); // reinitialize to drop results
-                currentMember = null;
+                ExitMeasurableMember();
             }
 
             public override void EnterFunctionStmt([NotNull] VBAParser.FunctionStmtContext context)
@@ -126,9 +120,46 @@ public override void EnterFunctionStmt([NotNull] VBAParser.FunctionStmtContext c
             public override void ExitFunctionStmt([NotNull] VBAParser.FunctionStmtContext context)
             {
                 // well, we're done here
-                memberResults.Add(new MemberMetricsResult(currentMember, results));
-                results = new List<CodeMetricsResult>(); // reinitialize to drop results
-                currentMember = null;
+                ExitMeasurableMember();
+            }
+
+            public override void EnterPropertyGetStmt([NotNull] VBAParser.PropertyGetStmtContext context)
+            {
+                results.Add(new CodeMetricsResult(0, 1, 0));
+
+                currentMember = _finder.DeclarationsWithType(DeclarationType.PropertyGet).Where(d => d.Context == context).First();
+            }
+
+            public override void ExitPropertyGetStmt([NotNull] VBAParser.PropertyGetStmtContext context)
+            {
+                // well, we're done here
+                ExitMeasurableMember();
+            }
+
+            public override void EnterPropertyLetStmt([NotNull] VBAParser.PropertyLetStmtContext context)
+            {
+                results.Add(new CodeMetricsResult(0, 1, 0));
+
+                currentMember = _finder.DeclarationsWithType(DeclarationType.PropertyLet).Where(d => d.Context == context).First();
+            }
+
+            public override void ExitPropertyLetStmt([NotNull] VBAParser.PropertyLetStmtContext context)
+            {
+                // well, we're done here
+                ExitMeasurableMember();
+            }
+
+            public override void EnterPropertySetStmt([NotNull] VBAParser.PropertySetStmtContext context)
+            {
+                results.Add(new CodeMetricsResult(0, 1, 0));
+
+                currentMember = _finder.DeclarationsWithType(DeclarationType.PropertySet).Where(d => d.Context == context).First();
+            }
+
+            public override void ExitPropertySetStmt([NotNull] VBAParser.PropertySetStmtContext context)
+            {
+                // well, we're done here
+                ExitMeasurableMember();
             }
 
             public override void EnterBlockStmt([NotNull] VBAParser.BlockStmtContext context)
@@ -138,9 +169,15 @@ public override void EnterBlockStmt([NotNull] VBAParser.BlockStmtContext context
                 // FIXME LINE_CONTINUATION might interfere here
                 //results.Add(new CodeMetricsResult(0, 0, ws.ChildCount / 4));
             }
-
             // FIXME also check if we need to do something about `mandatoryLineContinuation`?
 
+            private void ExitMeasurableMember()
+            {
+                memberResults.Add(new MemberMetricsResult(currentMember, results));
+                results = new List<CodeMetricsResult>(); // reinitialize to drop results
+                currentMember = null;
+            }
+
             internal ModuleMetricsResult GetMetricsResult(QualifiedModuleName qmn)
             {
                 return new ModuleMetricsResult(qmn, memberResults, moduleResults);

RubberduckTests/Stats/ParseTreeMetricsAnalystTests.cs

@@ -232,5 +232,55 @@ End Sub
                 Assert.AreEqual(blockCount + 1, metrics.Result.CyclomaticComplexity);
             }
         }
+
+        [TestMethod]
+        [TestCategory("Code Metrics")]
+        public void PropertyGet_HasCyclomaticComplexity_One()
+        {
+            var code = @"
+Public Property Get Complexity() As Long
+    Complexity = 1
+End Property
+";
+            var state = MockParser.ParseString(code, out var _);
+            var metrics = cut.ModuleMetrics(state, cts.Token).First();
+            Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
+        }
+
+        [TestMethod]
+        [TestCategory("Code Metrics")]
+        public void PropertyLet_HasCyclomaticComplexity_One()
+        {
+            var code = @"
+Option Explicit
+
+Private mComplexity As Long
+
+Public Property Let Complexity(ByVal complexity As Long)
+    mComplexity = complexity
+End Property
+";
+            var state = MockParser.ParseString(code, out var _);
+            var metrics = cut.ModuleMetrics(state, cts.Token).First();
+            Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
+        }
+
+        [TestMethod]
+        [TestCategory("Code Metrics")]
+        public void PropertySet_HasCyclomaticComplexity_One()
+        {
+            var code = @"
+Option Explicit
+
+Private mComplexity As Object
+
+Public Property Set Complexity(ByRef complexity As Object)
+    mComplexity = complexity
+End Property
+";
+            var state = MockParser.ParseString(code, out var _);
+            var metrics = cut.ModuleMetrics(state, cts.Token).First();
+            Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
+        }
     }
 }