@@ -55,10 +55,10 @@ private class CodeMetricsListener : VBAParserBaseListener
55
55
private readonly IIndenterSettings _indenterSettings ;
56
56
57
57
private Declaration currentMember ;
58
- private List < CodeMetricsResult > results = new List < CodeMetricsResult > ( ) ;
59
- private List < CodeMetricsResult > moduleResults = new List < CodeMetricsResult > ( ) ;
58
+ private List < CodeMetricsResult > _results = new List < CodeMetricsResult > ( ) ;
59
+ private List < CodeMetricsResult > _moduleResults = new List < CodeMetricsResult > ( ) ;
60
60
61
- private List < MemberMetricsResult > memberResults = new List < MemberMetricsResult > ( ) ;
61
+ private List < MemberMetricsResult > _memberResults = new List < MemberMetricsResult > ( ) ;
62
62
63
63
public CodeMetricsListener ( DeclarationFinder finder , IIndenterSettings indenterSettings )
64
64
{
@@ -76,39 +76,39 @@ public override void EnterEndOfLine([NotNull] VBAParser.EndOfLineContext context
76
76
var followingWhitespace = context . whiteSpace ( ) . LastOrDefault ( ) ;
77
77
followingIndentationLevel = IndentationLevelFromWhitespace ( followingWhitespace ) ;
78
78
}
79
- ( currentMember == null ? moduleResults : results ) . Add ( new CodeMetricsResult ( 1 , 0 , followingIndentationLevel ) ) ;
79
+ ( currentMember == null ? _moduleResults : _results ) . Add ( new CodeMetricsResult ( 1 , 0 , followingIndentationLevel ) ) ;
80
80
}
81
81
82
82
public override void EnterIfStmt ( [ NotNull ] VBAParser . IfStmtContext context )
83
83
{
84
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
84
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
85
85
}
86
86
87
87
public override void EnterElseIfBlock ( [ NotNull ] VBAParser . ElseIfBlockContext context )
88
88
{
89
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
89
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
90
90
}
91
91
92
92
// notably: NO additional complexity for an Else-Block
93
93
94
94
public override void EnterForEachStmt ( [ NotNull ] VBAParser . ForEachStmtContext context )
95
95
{
96
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
96
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
97
97
}
98
98
99
99
public override void EnterForNextStmt ( [ NotNull ] VBAParser . ForNextStmtContext context )
100
100
{
101
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
101
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
102
102
}
103
103
104
104
public override void EnterCaseClause ( [ NotNull ] VBAParser . CaseClauseContext context )
105
105
{
106
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
106
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
107
107
}
108
108
109
109
public override void EnterSubStmt ( [ NotNull ] VBAParser . SubStmtContext context )
110
110
{
111
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
111
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
112
112
currentMember = _finder . DeclarationsWithType ( DeclarationType . Procedure ) . Where ( d => d . Context == context ) . First ( ) ;
113
113
}
114
114
@@ -119,7 +119,7 @@ public override void ExitSubStmt([NotNull] VBAParser.SubStmtContext context)
119
119
120
120
public override void EnterFunctionStmt ( [ NotNull ] VBAParser . FunctionStmtContext context )
121
121
{
122
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
122
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
123
123
currentMember = _finder . DeclarationsWithType ( DeclarationType . Function ) . Where ( d => d . Context == context ) . First ( ) ;
124
124
}
125
125
@@ -130,7 +130,7 @@ public override void ExitFunctionStmt([NotNull] VBAParser.FunctionStmtContext co
130
130
131
131
public override void EnterPropertyGetStmt ( [ NotNull ] VBAParser . PropertyGetStmtContext context )
132
132
{
133
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
133
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
134
134
currentMember = _finder . DeclarationsWithType ( DeclarationType . PropertyGet ) . Where ( d => d . Context == context ) . First ( ) ;
135
135
}
136
136
@@ -141,7 +141,7 @@ public override void ExitPropertyGetStmt([NotNull] VBAParser.PropertyGetStmtCont
141
141
142
142
public override void EnterPropertyLetStmt ( [ NotNull ] VBAParser . PropertyLetStmtContext context )
143
143
{
144
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
144
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
145
145
currentMember = _finder . DeclarationsWithType ( DeclarationType . PropertyLet ) . Where ( d => d . Context == context ) . First ( ) ;
146
146
}
147
147
@@ -152,7 +152,7 @@ public override void ExitPropertyLetStmt([NotNull] VBAParser.PropertyLetStmtCont
152
152
153
153
public override void EnterPropertySetStmt ( [ NotNull ] VBAParser . PropertySetStmtContext context )
154
154
{
155
- results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
155
+ _results . Add ( new CodeMetricsResult ( 0 , 1 , 0 ) ) ;
156
156
currentMember = _finder . DeclarationsWithType ( DeclarationType . PropertySet ) . Where ( d => d . Context == context ) . First ( ) ;
157
157
}
158
158
@@ -165,7 +165,7 @@ public override void EnterBlockStmt([NotNull] VBAParser.BlockStmtContext context
165
165
{
166
166
// there is a whitespace context here after the option of a statementLabel.
167
167
// we need to account for that
168
- results . Add ( new CodeMetricsResult ( 0 , 0 , IndentationLevelFromWhitespace ( context . whiteSpace ( ) ) ) ) ;
168
+ _results . Add ( new CodeMetricsResult ( 0 , 0 , IndentationLevelFromWhitespace ( context . whiteSpace ( ) ) ) ) ;
169
169
}
170
170
171
171
private int IndentationLevelFromWhitespace ( VBAParser . WhiteSpaceContext wsContext )
@@ -179,14 +179,14 @@ private int IndentationLevelFromWhitespace(VBAParser.WhiteSpaceContext wsContext
179
179
180
180
private void ExitMeasurableMember ( )
181
181
{
182
- memberResults . Add ( new MemberMetricsResult ( currentMember , results ) ) ;
183
- results = new List < CodeMetricsResult > ( ) ; // reinitialize to drop results
182
+ _memberResults . Add ( new MemberMetricsResult ( currentMember , _results ) ) ;
183
+ _results = new List < CodeMetricsResult > ( ) ; // reinitialize to drop results
184
184
currentMember = null ;
185
185
}
186
186
187
187
internal ModuleMetricsResult GetMetricsResult ( QualifiedModuleName qmn )
188
188
{
189
- return new ModuleMetricsResult ( qmn , memberResults , moduleResults ) ;
189
+ return new ModuleMetricsResult ( qmn , _memberResults , _moduleResults ) ;
190
190
}
191
191
}
192
192
}
0 commit comments