Skip to content

Commit 8f87314

Browse files
Vogel612Vogel612
committed
Remove CancellationToken from CodeMetrics Analysis
1 parent 8207ab7 commit 8f87314

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

‎RetailCoder.VBE/Navigation/CodeMetrics/ICodeMetricsAnalyst.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ namespace Rubberduck.Navigation.CodeMetrics
1010
{
1111
public interface ICodeMetricsAnalyst
1212
{
13-
IEnumerable<ModuleMetricsResult> ModuleMetrics(RubberduckParserState state, CancellationToken token);
13+
IEnumerable<ModuleMetricsResult> ModuleMetrics(RubberduckParserState state);
1414
}
1515
}

‎RetailCoder.VBE/Navigation/CodeMetrics/ParseTreeMetricsAnalyst.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Collections.Generic;
22
using System.Linq;
3-
using System.Threading;
43
using Rubberduck.Parsing.VBA;
54
using Antlr4.Runtime.Tree;
65
using Rubberduck.Parsing.Grammar;
@@ -12,7 +11,7 @@ namespace Rubberduck.Navigation.CodeMetrics
1211
{
1312
public class ParseTreeMetricsAnalyst : ICodeMetricsAnalyst
1413
{
15-
public IEnumerable<ModuleMetricsResult> ModuleMetrics(RubberduckParserState state, CancellationToken token)
14+
public IEnumerable<ModuleMetricsResult> ModuleMetrics(RubberduckParserState state)
1615
{
1716
if (state == null || !state.AllUserDeclarations.Any())
1817
{
@@ -24,10 +23,6 @@ public IEnumerable<ModuleMetricsResult> ModuleMetrics(RubberduckParserState stat
2423

2524
foreach (var moduleTree in trees)
2625
{
27-
if (token.IsCancellationRequested)
28-
{
29-
yield break;
30-
}
3126
yield return GetModuleResult(moduleTree.Key, moduleTree.Value, state.DeclarationFinder);
3227
};
3328
}

‎RubberduckTests/Stats/ParseTreeMetricsAnalystTests.cs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ namespace RubberduckTests.Stats
1414
public class ParseTreeMetricsAnalystTests
1515
{
1616
private ParseTreeMetricsAnalyst cut;
17-
private CancellationTokenSource cts;
1817

1918
[TestInitialize]
2019
public void Setup()
2120
{
2221
cut = new ParseTreeMetricsAnalyst();
23-
cts = new CancellationTokenSource();
2422
}
2523

2624
[TestMethod]
@@ -29,7 +27,7 @@ public void EmptyModule_HasMetricsZeroed()
2927
{
3028
var code = @"";
3129
var state = MockParser.ParseString(code, out var qmn);
32-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
30+
var metrics = cut.ModuleMetrics(state).First();
3331
Assert.AreEqual(new CodeMetricsResult(), metrics.Result);
3432
}
3533

@@ -42,7 +40,7 @@ Sub NoCode()
4240
End Sub
4341
";
4442
var state = MockParser.ParseString(code, out var _);
45-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
43+
var metrics = cut.ModuleMetrics(state).First();
4644
Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
4745
}
4846

@@ -56,7 +54,7 @@ End Function
5654
";
5755

5856
var state = MockParser.ParseString(code, out var _);
59-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
57+
var metrics = cut.ModuleMetrics(state).First();
6058
Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
6159
}
6260

@@ -74,7 +72,7 @@ public void ModuleHas_AsManyLines_AsPhysicalLines()
7472
var code = builder.ToString();
7573

7674
var state = MockParser.ParseString(code, out var _);
77-
var metric = cut.ModuleMetrics(state, cts.Token).First();
75+
var metric = cut.ModuleMetrics(state).First();
7876
Assert.AreEqual(lineCount, metric.Result.Lines);
7977
}
8078
}
@@ -90,7 +88,7 @@ End If
9088
End Sub
9189
";
9290
var state = MockParser.ParseString(code, out var _);
93-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
91+
var metrics = cut.ModuleMetrics(state).First();
9492
Assert.AreEqual(2, metrics.Result.CyclomaticComplexity);
9593
}
9694

@@ -106,7 +104,7 @@ End If
106104
End Sub
107105
";
108106
var state = MockParser.ParseString(code, out var _);
109-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
107+
var metrics = cut.ModuleMetrics(state).First();
110108
Assert.AreEqual(2, metrics.Result.CyclomaticComplexity);
111109
}
112110

@@ -122,7 +120,7 @@ End If
122120
End Sub
123121
";
124122
var state = MockParser.ParseString(code, out var _);
125-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
123+
var metrics = cut.ModuleMetrics(state).First();
126124
Assert.AreEqual(3, metrics.Result.CyclomaticComplexity);
127125
}
128126

@@ -139,7 +137,7 @@ End If
139137
End Sub
140138
";
141139
var state = MockParser.ParseString(code, out var _);
142-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
140+
var metrics = cut.ModuleMetrics(state).First();
143141
Assert.AreEqual(3, metrics.Result.CyclomaticComplexity);
144142
}
145143

@@ -156,7 +154,7 @@ End If
156154
End Sub
157155
";
158156
var state = MockParser.ParseString(code, out var _);
159-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
157+
var metrics = cut.ModuleMetrics(state).First();
160158
Assert.AreEqual(3, metrics.Result.CyclomaticComplexity);
161159
}
162160

@@ -172,7 +170,7 @@ Next stuff
172170
End Sub
173171
";
174172
var state = MockParser.ParseString(code, out var _);
175-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
173+
var metrics = cut.ModuleMetrics(state).First();
176174
Assert.AreEqual(2, metrics.Result.CyclomaticComplexity);
177175
}
178176

@@ -189,7 +187,7 @@ Next i
189187
End Sub
190188
";
191189
var state = MockParser.ParseString(code, out var _);
192-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
190+
var metrics = cut.ModuleMetrics(state).First();
193191
Assert.AreEqual(2, metrics.Result.CyclomaticComplexity);
194192
}
195193

@@ -205,7 +203,7 @@ End Select
205203
End Sub
206204
";
207205
var state = MockParser.ParseString(code, out var _);
208-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
206+
var metrics = cut.ModuleMetrics(state).First();
209207
Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
210208
}
211209

@@ -228,7 +226,7 @@ End Select
228226
End Sub
229227
";
230228
var state = MockParser.ParseString(code, out var _);
231-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
229+
var metrics = cut.ModuleMetrics(state).First();
232230
Assert.AreEqual(blockCount + 1, metrics.Result.CyclomaticComplexity);
233231
}
234232
}
@@ -243,7 +241,7 @@ Public Property Get Complexity() As Long
243241
End Property
244242
";
245243
var state = MockParser.ParseString(code, out var _);
246-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
244+
var metrics = cut.ModuleMetrics(state).First();
247245
Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
248246
}
249247

@@ -261,7 +259,7 @@ Public Property Let Complexity(ByVal complexity As Long)
261259
End Property
262260
";
263261
var state = MockParser.ParseString(code, out var _);
264-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
262+
var metrics = cut.ModuleMetrics(state).First();
265263
Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
266264
}
267265

@@ -279,7 +277,7 @@ Public Property Set Complexity(ByRef complexity As Object)
279277
End Property
280278
";
281279
var state = MockParser.ParseString(code, out var _);
282-
var metrics = cut.ModuleMetrics(state, cts.Token).First();
280+
var metrics = cut.ModuleMetrics(state).First();
283281
Assert.AreEqual(1, metrics.Result.CyclomaticComplexity);
284282
}
285283
}

0 commit comments

Comments
 (0)