Skip to content

Commit be8ad43

Browse files
committed
Made inspections take a CancellationToken.
1 parent 7e46746 commit be8ad43

File tree

58 files changed

+439
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+439
-392
lines changed

Rubberduck.Inspections/Abstract/InspectionBase.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Rubberduck.Parsing.VBA;
1010
using Rubberduck.VBEditor;
1111
using System.Diagnostics;
12+
using System.Threading;
1213
using NLog;
1314

1415
namespace Rubberduck.Inspections.Abstract
@@ -156,8 +157,9 @@ public int CompareTo(object obj)
156157
/// <summary>
157158
/// A method that inspects the parser state and returns all issues it can find.
158159
/// </summary>
160+
/// <param name="token"></param>
159161
/// <returns></returns>
160-
public IEnumerable<IInspectionResult> GetInspectionResults()
162+
public IEnumerable<IInspectionResult> GetInspectionResults(CancellationToken token)
161163
{
162164
var _stopwatch = new Stopwatch();
163165
_stopwatch.Start();

Rubberduck.Inspections/Inspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private static void RunInspection(IInspection inspection, ConcurrentBag<IInspect
156156
{
157157
try
158158
{
159-
var inspectionResults = inspection.GetInspectionResults();
159+
var inspectionResults = inspection.GetInspectionResults(token);
160160

161161
token.ThrowIfCancellationRequested();
162162

Rubberduck.Parsing/Inspections/Abstract/IInspection.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Threading;
34

45
namespace Rubberduck.Parsing.Inspections.Abstract
56
{
@@ -11,7 +12,8 @@ public interface IInspection : IInspectionModel, IComparable<IInspection>, IComp
1112
/// <summary>
1213
/// Runs code inspection and returns inspection results.
1314
/// </summary>
15+
/// <param name="token"></param>
1416
/// <returns>Returns inspection results, if any.</returns>
15-
IEnumerable<IInspectionResult> GetInspectionResults();
17+
IEnumerable<IInspectionResult> GetInspectionResults(CancellationToken token);
1618
}
1719
}

RubberduckTests/Inspections/ApplicationWorksheetFunctionInspectionTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ End Sub
5151
{
5252

5353
var inspection = new ApplicationWorksheetFunctionInspection(state);
54-
var inspectionResults = inspection.GetInspectionResults();
54+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
5555

5656
Assert.AreEqual(1, inspectionResults.Count());
5757
}
@@ -75,7 +75,7 @@ End Sub
7575
{
7676

7777
var inspection = new ApplicationWorksheetFunctionInspection(state);
78-
var inspectionResults = inspection.GetInspectionResults();
78+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
7979

8080
Assert.AreEqual(1, inspectionResults.Count());
8181
}
@@ -99,7 +99,7 @@ End Sub
9999
{
100100

101101
var inspection = new ApplicationWorksheetFunctionInspection(state);
102-
var inspectionResults = inspection.GetInspectionResults();
102+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
103103

104104
Assert.AreEqual(1, inspectionResults.Count());
105105
}
@@ -125,7 +125,7 @@ End Sub
125125
{
126126

127127
var inspection = new ApplicationWorksheetFunctionInspection(state);
128-
var inspectionResults = inspection.GetInspectionResults();
128+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
129129

130130
Assert.AreEqual(1, inspectionResults.Count());
131131
}
@@ -147,7 +147,7 @@ End Sub
147147
{
148148

149149
var inspection = new ApplicationWorksheetFunctionInspection(state);
150-
var inspectionResults = inspection.GetInspectionResults();
150+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
151151

152152
Assert.IsFalse(inspectionResults.Any());
153153
}
@@ -171,7 +171,7 @@ End Sub
171171
{
172172

173173
var inspection = new ApplicationWorksheetFunctionInspection(state);
174-
var inspectionResults = inspection.GetInspectionResults();
174+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
175175

176176
Assert.IsFalse(inspectionResults.Any());
177177
}
@@ -202,7 +202,7 @@ End Sub
202202
}
203203

204204
var inspection = new ApplicationWorksheetFunctionInspection(state);
205-
var inspectionResults = inspection.GetInspectionResults();
205+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
206206

207207
Assert.IsFalse(inspectionResults.Any());
208208
}
@@ -225,7 +225,7 @@ End Sub
225225
{
226226

227227
var inspection = new ApplicationWorksheetFunctionInspection(state);
228-
var inspectionResults = inspection.GetInspectionResults();
228+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
229229

230230
Assert.IsFalse(inspectionResults.Any());
231231
}

RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Linq;
2+
using System.Threading;
23
using NUnit.Framework;
34
using RubberduckTests.Mocks;
45
using Rubberduck.Inspections.Concrete;
@@ -23,7 +24,7 @@ public void AssignedByValParameter_ReturnsResult_Sub()
2324
using (var state = MockParser.CreateAndParse(vbe.Object))
2425
{
2526
var inspection = new AssignedByValParameterInspection(state);
26-
var inspectionResults = inspection.GetInspectionResults();
27+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
2728

2829
Assert.AreEqual(1, inspectionResults.Count());
2930
}
@@ -43,7 +44,7 @@ public void AssignedByValParameter_ReturnsResult_Function()
4344
using (var state = MockParser.CreateAndParse(vbe.Object))
4445
{
4546
var inspection = new AssignedByValParameterInspection(state);
46-
var inspectionResults = inspection.GetInspectionResults();
47+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
4748

4849
Assert.AreEqual(1, inspectionResults.Count());
4950
}
@@ -64,7 +65,7 @@ public void AssignedByValParameter_ReturnsResult_MultipleParams()
6465
using (var state = MockParser.CreateAndParse(vbe.Object))
6566
{
6667
var inspection = new AssignedByValParameterInspection(state);
67-
var inspectionResults = inspection.GetInspectionResults();
68+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
6869

6970
Assert.AreEqual(2, inspectionResults.Count());
7071
}
@@ -83,7 +84,7 @@ public void AssignedByValParameter_DoesNotReturnResult()
8384
using (var state = MockParser.CreateAndParse(vbe.Object))
8485
{
8586
var inspection = new AssignedByValParameterInspection(state);
86-
var inspectionResults = inspection.GetInspectionResults();
87+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
8788

8889
Assert.IsFalse(inspectionResults.Any());
8990
}
@@ -104,7 +105,7 @@ Public Sub Foo(ByVal arg1 As String)
104105
using (var state = MockParser.CreateAndParse(vbe.Object))
105106
{
106107
var inspection = new AssignedByValParameterInspection(state);
107-
var inspectionResults = inspection.GetInspectionResults();
108+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
108109

109110
Assert.IsFalse(inspectionResults.Any());
110111
}
@@ -127,7 +128,7 @@ Dim var1 As Integer
127128
using (var state = MockParser.CreateAndParse(vbe.Object))
128129
{
129130
var inspection = new AssignedByValParameterInspection(state);
130-
var inspectionResults = inspection.GetInspectionResults();
131+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
131132

132133
Assert.AreEqual(1, inspectionResults.Count());
133134
}
@@ -163,7 +164,7 @@ End Sub
163164
using (var state = MockParser.CreateAndParse(vbe.Object))
164165
{
165166
var inspection = new AssignedByValParameterInspection(state);
166-
var inspectionResults = inspection.GetInspectionResults();
167+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
167168

168169
Assert.IsFalse(inspectionResults.Any());
169170
}

RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Linq;
2+
using System.Threading;
23
using NUnit.Framework;
34
using Rubberduck.Inspections.Concrete;
45
using RubberduckTests.Mocks;
@@ -22,7 +23,7 @@ public void ConstantNotUsed_ReturnsResult()
2223
{
2324

2425
var inspection = new ConstantNotUsedInspection(state);
25-
var inspectionResults = inspection.GetInspectionResults();
26+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
2627

2728
Assert.AreEqual(1, inspectionResults.Count());
2829
}
@@ -43,7 +44,7 @@ public void ConstantNotUsed_ReturnsResult_MultipleConsts()
4344
{
4445

4546
var inspection = new ConstantNotUsedInspection(state);
46-
var inspectionResults = inspection.GetInspectionResults();
47+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
4748

4849
Assert.AreEqual(2, inspectionResults.Count());
4950
}
@@ -69,7 +70,7 @@ Public Sub Goo(ByVal arg1 As Integer)
6970
{
7071

7172
var inspection = new ConstantNotUsedInspection(state);
72-
var inspectionResults = inspection.GetInspectionResults();
73+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
7374

7475
Assert.AreEqual(1, inspectionResults.Count());
7576
}
@@ -93,7 +94,7 @@ Public Sub Goo(ByVal arg1 As Integer)
9394
{
9495

9596
var inspection = new ConstantNotUsedInspection(state);
96-
var inspectionResults = inspection.GetInspectionResults();
97+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
9798

9899
Assert.AreEqual(0, inspectionResults.Count());
99100
}
@@ -115,7 +116,7 @@ Public Sub Foo()
115116
{
116117

117118
var inspection = new ConstantNotUsedInspection(state);
118-
var inspectionResults = inspection.GetInspectionResults();
119+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
119120

120121
Assert.IsFalse(inspectionResults.Any());
121122
}
@@ -137,7 +138,7 @@ Public Sub Foo()
137138
{
138139

139140
var inspection = new ConstantNotUsedInspection(state);
140-
var inspectionResults = inspection.GetInspectionResults();
141+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
141142

142143
Assert.IsFalse(inspectionResults.Any());
143144
}
@@ -159,7 +160,7 @@ Public Sub Foo()
159160
{
160161

161162
var inspection = new ConstantNotUsedInspection(state);
162-
var inspectionResults = inspection.GetInspectionResults();
163+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
163164

164165
Assert.IsTrue(inspectionResults.Any());
165166
}
@@ -180,7 +181,7 @@ public void ConstantNotUsed_Ignored_DoesNotReturnResult()
180181
{
181182

182183
var inspection = new ConstantNotUsedInspection(state);
183-
var inspectionResults = inspection.GetInspectionResults();
184+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
184185

185186
Assert.IsFalse(inspectionResults.Any());
186187
}

RubberduckTests/Inspections/DefaultProjectNameInspectionTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Linq;
2+
using System.Threading;
23
using NUnit.Framework;
34
using Rubberduck.Inspections.Concrete;
45
using Rubberduck.VBEditor.SafeComWrappers;
@@ -22,7 +23,7 @@ public void DefaultProjectName_ReturnsResult()
2223
using (var state = MockParser.CreateAndParse(vbe.Object))
2324
{
2425
var inspection = new DefaultProjectNameInspection(state);
25-
var inspectionResults = inspection.GetInspectionResults();
26+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
2627

2728
Assert.AreEqual(1, inspectionResults.Count());
2829
}
@@ -41,7 +42,7 @@ public void DefaultProjectName_DoesNotReturnResult()
4142
using (var state = MockParser.CreateAndParse(vbe.Object))
4243
{
4344
var inspection = new DefaultProjectNameInspection(state);
44-
var inspectionResults = inspection.GetInspectionResults();
45+
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
4546

4647
Assert.AreEqual(0, inspectionResults.Count());
4748
}

0 commit comments

Comments
 (0)