Skip to content

Commit 8592284

Browse files
committed
Removed overloads for state setting methods in Rubberduck that do not take a CancellationToken.
1 parent 352a87c commit 8592284

File tree

5 files changed

+18
-30
lines changed

5 files changed

+18
-30
lines changed

Rubberduck.Parsing/VBA/RubberduckParserState.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,6 @@ private void OnModuleStateChanged(QualifiedModuleName module, ParserState state,
318318
}
319319
}
320320

321-
public void SetModuleState(QualifiedModuleName module, ParserState state, SyntaxErrorException parserError = null, bool evaluateOverallState = true)
322-
{
323-
SetModuleState(module, state, CancellationToken.None, parserError, evaluateOverallState);
324-
}
325-
326321
public void SetModuleState(QualifiedModuleName module, ParserState state, CancellationToken token, SyntaxErrorException parserError = null, bool evaluateOverallState = true)
327322
{
328323
if (token.IsCancellationRequested)
@@ -361,11 +356,6 @@ private IVBProject GetProject(string projectId)
361356
return _projectRepository.Project(projectId);
362357
}
363358

364-
public void EvaluateParserState()
365-
{
366-
EvaluateParserState(CancellationToken.None);
367-
}
368-
369359
public void EvaluateParserState(CancellationToken token)
370360
{
371361
lock (_statusLockObject)
@@ -509,7 +499,6 @@ public ParserState GetModuleState(QualifiedModuleName module)
509499
public ParserState Status
510500
{
511501
get => _status;
512-
private set => SetStatusWithCancellation(value, CancellationToken.None);
513502
}
514503

515504
private void SetStatusWithCancellation(ParserState value, CancellationToken token)
@@ -521,11 +510,6 @@ private void SetStatusWithCancellation(ParserState value, CancellationToken toke
521510
}
522511
}
523512

524-
public void SetStatusAndFireStateChanged(object requestor, ParserState status)
525-
{
526-
SetStatusAndFireStateChanged(requestor, status, CancellationToken.None);
527-
}
528-
529513
public void SetStatusAndFireStateChanged(object requestor, ParserState status, CancellationToken token)
530514
{
531515
if (Status == status)

RubberduckTests/Commands/FindAllImplementationsTests.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 System.Windows.Forms;
34
using NUnit.Framework;
45
using Moq;
@@ -224,7 +225,7 @@ Private Sub Bar()
224225

225226
using (var state = MockParser.CreateAndParse(vbe.Object))
226227
{
227-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
228+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
228229

229230
var vm = new SearchResultsWindowViewModel();
230231
var command = new FindAllImplementationsCommand(null, null, state, vbe.Object, vm, null);
@@ -272,7 +273,7 @@ Private Sub Bar()
272273

273274
using (var state = MockParser.CreateAndParse(vbe.Object))
274275
{
275-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
276+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
276277

277278
var vm = new SearchResultsWindowViewModel();
278279
var command = new FindAllImplementationsCommand(null, null, state, vbe.Object, vm, null);

RubberduckTests/Commands/FindAllReferencesTests.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 System.Windows.Forms;
34
using NUnit.Framework;
45
using Moq;
@@ -168,7 +169,7 @@ Private Sub Bar()
168169

169170
using (var state = MockParser.CreateAndParse(vbe.Object))
170171
{
171-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
172+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
172173

173174
var vm = new SearchResultsWindowViewModel();
174175
var command = new FindAllReferencesCommand(null, null, state, vbe.Object, vm, null);
@@ -218,7 +219,7 @@ Private Sub Bar()
218219
using (var state = MockParser.CreateAndParse(vbe.Object))
219220
{
220221

221-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
222+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
222223

223224
var vm = new SearchResultsWindowViewModel();
224225
var command = new FindAllReferencesCommand(null, null, state, vbe.Object, vm, null);

RubberduckTests/Commands/RefactorCommandTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Threading;
12
using NUnit.Framework;
23
using Moq;
34
using Rubberduck.Parsing.VBA;
@@ -37,7 +38,7 @@ public void EncapsulateField_CanExecute_NonReadyState()
3738
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(string.Empty, out component);
3839
using (var state = MockParser.CreateAndParse(vbe.Object))
3940
{
40-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
41+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
4142

4243
var encapsulateFieldCommand = new RefactorEncapsulateFieldCommand(vbe.Object, state, null);
4344
Assert.IsFalse(encapsulateFieldCommand.CanExecute(null));
@@ -126,7 +127,7 @@ public void ExtractInterface_CanExecute_NonReadyState()
126127

127128
using (var state = MockParser.CreateAndParse(vbe.Object))
128129
{
129-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
130+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
130131

131132
var extractInterfaceCommand = new RefactorExtractInterfaceCommand(vbe.Object, state, null);
132133
Assert.IsFalse(extractInterfaceCommand.CanExecute(null));
@@ -355,7 +356,7 @@ public void ImplementInterface_CanExecute_NonReadyState()
355356

356357
using (var state = MockParser.CreateAndParse(vbe.Object))
357358
{
358-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
359+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
359360

360361
var implementInterfaceCommand = new RefactorImplementInterfaceCommand(vbe.Object, state, null);
361362
Assert.IsFalse(implementInterfaceCommand.CanExecute(null));
@@ -420,7 +421,7 @@ public void IntroduceField_CanExecute_NonReadyState()
420421

421422
using (var state = MockParser.CreateAndParse(vbe.Object))
422423
{
423-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
424+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
424425

425426
var msgbox = new Mock<IMessageBox>();
426427
var introduceFieldCommand = new RefactorIntroduceFieldCommand(vbe.Object, state, msgbox.Object);
@@ -488,7 +489,7 @@ public void IntroduceParameter_CanExecute_NonReadyState()
488489

489490
using (var state = MockParser.CreateAndParse(vbe.Object))
490491
{
491-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
492+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
492493

493494
var msgbox = new Mock<IMessageBox>();
494495
var introduceParameterCommand = new RefactorIntroduceParameterCommand(vbe.Object, state, msgbox.Object);
@@ -555,7 +556,7 @@ public void MoveCloserToUsage_CanExecute_NonReadyState()
555556

556557
using (var state = MockParser.CreateAndParse(vbe.Object))
557558
{
558-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
559+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
559560

560561
var moveCloserToUsageCommand = new RefactorMoveCloserToUsageCommand(vbe.Object, state, null);
561562
Assert.IsFalse(moveCloserToUsageCommand.CanExecute(null));
@@ -694,7 +695,7 @@ public void RemoveParameters_CanExecute_NonReadyState()
694695

695696
using (var state = MockParser.CreateAndParse(vbe.Object))
696697
{
697-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
698+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
698699

699700
var removeParametersCommand = new RefactorRemoveParametersCommand(vbe.Object, state, null);
700701
Assert.IsFalse(removeParametersCommand.CanExecute(null));
@@ -939,7 +940,7 @@ public void ReorderParameters_CanExecute_NonReadyState()
939940

940941
using (var state = MockParser.CreateAndParse(vbe.Object))
941942
{
942-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations);
943+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvedDeclarations, CancellationToken.None);
943944

944945
var reorderParametersCommand = new RefactorReorderParametersCommand(vbe.Object, state, null);
945946
Assert.IsFalse(reorderParametersCommand.CanExecute(null));

RubberduckTests/Commands/UnitTestCommandTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Linq;
3+
using System.Threading;
34
using NUnit.Framework;
45
using Moq;
56
using Rubberduck.Parsing.Annotations;
@@ -80,7 +81,7 @@ public void AddTest_CanExecute_NonReadyState()
8081
using (var state = MockParser.CreateAndParse(vbe.Object))
8182
{
8283

83-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvingReferences);
84+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvingReferences, CancellationToken.None);
8485

8586
var addTestMethodCommand = new AddTestMethodCommand(vbe.Object, state);
8687
Assert.IsFalse(addTestMethodCommand.CanExecute(null));
@@ -161,7 +162,7 @@ public void AddExpectedErrorTest_CanExecute_NonReadyState()
161162

162163
using (var state = MockParser.CreateAndParse(vbe.Object))
163164
{
164-
state.SetStatusAndFireStateChanged(this, ParserState.ResolvingReferences);
165+
state.SetStatusAndFireStateChanged(this, ParserState.ResolvingReferences, CancellationToken.None);
165166

166167
var addTestMethodCommand = new AddTestMethodExpectedErrorCommand(vbe.Object, state);
167168
Assert.IsFalse(addTestMethodCommand.CanExecute(null));

0 commit comments

Comments
 (0)