From ec8d297d7049993e7dbb2f168112a91f4f1c33ab Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 12:43:11 -0600 Subject: [PATCH 1/7] Fix bug and enhance Introduce Parameter Refactoring. Rename "parseResult" to "parser" in all tests. Add one test for Introduce Parameter Refactoring. --- .../IntroduceParameterRefactoring.cs | 18 +- .../AssignedByValParameterInspectionTests.cs | 60 +-- .../ConstantNotUsedInspectionTests.cs | 50 +-- .../DefaultProjectNameInspectionTests.cs | 20 +- .../ImplicitByRefParameterInspectionTests.cs | 80 ++-- .../ImplicitPublicMemberInspectionTests.cs | 60 +-- ...mplicitVariantReturnTypeInspectionTests.cs | 70 +-- .../MultilineParameterInspectionTests.cs | 50 +-- .../MultipleDeclarationsInspectionTests.cs | 80 ++-- .../NonReturningFunctionInspectionTests.cs | 70 +-- .../ObsoleteCallStatementInspectionTests.cs | 50 +-- .../ObsoleteCommentSyntaxInspectionTests.cs | 60 +-- .../ObsoleteGlobalInspectionTests.cs | 50 +-- .../ObsoleteLetStatementInspectionTests.cs | 50 +-- .../OptionExplicitInspectionTests.cs | 50 +-- .../ParameterCanBeByValInspectionTests.cs | 80 ++-- .../ParameterNotUsedInspectionTests.cs | 60 +-- .../ProcedureNotUsedInspectionTests.cs | 80 ++-- .../VariableIsNeverAssignedInspectionTests.cs | 50 +-- .../VariableNeverUsedInspectionTests.cs | 50 +-- .../VariableTypeNotDeclaredInspectionTests.cs | 100 ++--- .../Refactoring/ExtractMethodTests.cs | 10 +- .../Refactoring/PromoteLocalToParameter.cs | 69 ++- .../Refactoring/RemoveParametersTests.cs | 418 +++++++++--------- RubberduckTests/Refactoring/RenameTests.cs | 304 ++++++------- .../Refactoring/ReorderParametersTests.cs | 374 ++++++++-------- RubberduckTests/RubberduckParserTests.cs | 20 +- 27 files changed, 1250 insertions(+), 1183 deletions(-) diff --git a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs index 65c040828f..af04179c1b 100644 --- a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs +++ b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs @@ -75,9 +75,7 @@ private void PromoteVariable(Declaration target) return; } - if ( - !new[] {DeclarationType.Class, DeclarationType.Module}.Contains( - target.ParentDeclaration.DeclarationType)) + if (IsContainedInClassOrModule(target)) { return; } @@ -86,6 +84,11 @@ private void PromoteVariable(Declaration target) UpdateSignature(target); } + private bool IsContainedInClassOrModule(Declaration target) + { + return target.ParentDeclaration != null && IsContainedInClassOrModule(target.ParentDeclaration); + } + private bool PromptIfMethodImplementsInterface(Declaration targetVariable) { var functionDeclaration = _declarations.FindTarget(targetVariable.QualifiedSelection, ValidDeclarationTypes); @@ -241,7 +244,14 @@ private void RemoveVariable(Declaration target) } _editor.DeleteLines(selection); - _editor.InsertLines(selection.StartLine, newLines); + var newLinesWithoutEmptyLines = newLines + .Split(new[] {" _" + Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + .Where(l => l.Trim() != string.Empty).ToList(); + + if (newLinesWithoutEmptyLines.Any()) + { + _editor.InsertLines(selection.StartLine, string.Join(" _" + Environment.NewLine, newLinesWithoutEmptyLines)); + } } private string GetOldSignature(Declaration target) diff --git a/RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs b/RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs index 810ed7b60d..8f631f72d7 100644 --- a/RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs +++ b/RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs @@ -38,14 +38,14 @@ public void AssignedByValParameter_ReturnsResult_Sub() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new AssignedByValParameterInspection(parseResult.State); + var inspection = new AssignedByValParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -65,14 +65,14 @@ public void AssignedByValParameter_ReturnsResult_Function() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new AssignedByValParameterInspection(parseResult.State); + var inspection = new AssignedByValParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -93,14 +93,14 @@ public void AssignedByValParameter_ReturnsResult_MultipleParams() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new AssignedByValParameterInspection(parseResult.State); + var inspection = new AssignedByValParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -119,14 +119,14 @@ public void AssignedByValParameter_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new AssignedByValParameterInspection(parseResult.State); + var inspection = new AssignedByValParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -149,14 +149,14 @@ Dim var1 As Integer var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new AssignedByValParameterInspection(parseResult.State); + var inspection = new AssignedByValParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -183,14 +183,14 @@ public void AssignedByValParameter_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new AssignedByValParameterInspection(parseResult.State); + var inspection = new AssignedByValParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs b/RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs index be2ecb7de1..64d14cd54e 100644 --- a/RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs +++ b/RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs @@ -38,14 +38,14 @@ public void ConstantNotUsed_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ConstantNotUsedInspection(parseResult.State); + var inspection = new ConstantNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ public void ConstantNotUsed_ReturnsResult_MultipleConsts() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ConstantNotUsedInspection(parseResult.State); + var inspection = new ConstantNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -97,14 +97,14 @@ Public Sub Goo(ByVal arg1 As Integer) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ConstantNotUsedInspection(parseResult.State); + var inspection = new ConstantNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -130,14 +130,14 @@ Public Sub Goo(ByVal arg1 As Integer) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ConstantNotUsedInspection(parseResult.State); + var inspection = new ConstantNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -163,14 +163,14 @@ public void ConstantNotUsed_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ConstantNotUsedInspection(parseResult.State); + var inspection = new ConstantNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/DefaultProjectNameInspectionTests.cs b/RubberduckTests/Inspections/DefaultProjectNameInspectionTests.cs index 34ac2be70f..bee2f596b5 100644 --- a/RubberduckTests/Inspections/DefaultProjectNameInspectionTests.cs +++ b/RubberduckTests/Inspections/DefaultProjectNameInspectionTests.cs @@ -37,14 +37,14 @@ public void DefaultProjectName_ReturnsResult() var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new DefaultProjectNameInspection(parseResult.State); + var inspection = new DefaultProjectNameInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -64,14 +64,14 @@ public void DefaultProjectName_DoesNotReturnResult() var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new DefaultProjectNameInspection(parseResult.State); + var inspection = new DefaultProjectNameInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); diff --git a/RubberduckTests/Inspections/ImplicitByRefParameterInspectionTests.cs b/RubberduckTests/Inspections/ImplicitByRefParameterInspectionTests.cs index 1aa51ffc78..79ffb7b371 100644 --- a/RubberduckTests/Inspections/ImplicitByRefParameterInspectionTests.cs +++ b/RubberduckTests/Inspections/ImplicitByRefParameterInspectionTests.cs @@ -37,14 +37,14 @@ public void ImplicitByRefParameter_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -63,14 +63,14 @@ public void ImplicitByRefParameter_ReturnsResult_MultipleParams() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -89,14 +89,14 @@ public void ImplicitByRefParameter_DoesNotReturnResult_ByRef() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -115,14 +115,14 @@ public void ImplicitByRefParameter_DoesNotReturnResult_ByVal() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -141,14 +141,14 @@ public void ImplicitByRefParameter_ReturnsResult_SomePassedByRefImplicitely() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -177,14 +177,14 @@ Sub IClass1_Foo(arg1 As Integer) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -209,14 +209,14 @@ public void ImplicitByRefParameter_QuickFixWorks_PassByRef() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); @@ -237,14 +237,14 @@ public void ImplicitByRefParameter_QuickFixWorks_ParamArrayMustBePassedByRef() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitByRefParameterInspection(parseResult.State); + var inspection = new ImplicitByRefParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.First().QuickFixes.Count()); diff --git a/RubberduckTests/Inspections/ImplicitPublicMemberInspectionTests.cs b/RubberduckTests/Inspections/ImplicitPublicMemberInspectionTests.cs index 140ad2c488..baaf80cab6 100644 --- a/RubberduckTests/Inspections/ImplicitPublicMemberInspectionTests.cs +++ b/RubberduckTests/Inspections/ImplicitPublicMemberInspectionTests.cs @@ -37,14 +37,14 @@ public void ImplicitPublicMember_ReturnsResult_Sub() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitPublicMemberInspection(parseResult.State); + var inspection = new ImplicitPublicMemberInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -64,14 +64,14 @@ public void ImplicitPublicMember_ReturnsResult_Function() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitPublicMemberInspection(parseResult.State); + var inspection = new ImplicitPublicMemberInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -93,14 +93,14 @@ Sub Goo() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitPublicMemberInspection(parseResult.State); + var inspection = new ImplicitPublicMemberInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -119,14 +119,14 @@ public void ImplicitPublicMember_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitPublicMemberInspection(parseResult.State); + var inspection = new ImplicitPublicMemberInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -148,14 +148,14 @@ Sub Goo() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitPublicMemberInspection(parseResult.State); + var inspection = new ImplicitPublicMemberInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -180,14 +180,14 @@ public void ImplicitPublicMember_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitPublicMemberInspection(parseResult.State); + var inspection = new ImplicitPublicMemberInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/ImplicitVariantReturnTypeInspectionTests.cs b/RubberduckTests/Inspections/ImplicitVariantReturnTypeInspectionTests.cs index 76d83f91dc..eae5af5637 100644 --- a/RubberduckTests/Inspections/ImplicitVariantReturnTypeInspectionTests.cs +++ b/RubberduckTests/Inspections/ImplicitVariantReturnTypeInspectionTests.cs @@ -37,14 +37,14 @@ public void ImplicitVariantReturnType_ReturnsResult_Function() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -63,14 +63,14 @@ public void ImplicitVariantReturnType_ReturnsResult_PropertyGet() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -92,14 +92,14 @@ Function Goo() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -118,14 +118,14 @@ public void ImplicitVariantReturnType_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -147,14 +147,14 @@ Function Goo() As String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -179,14 +179,14 @@ public void ImplicitVariantReturnType_QuickFixWorks_Function() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); @@ -213,14 +213,14 @@ public void ImplicitVariantReturnType_QuickFixWorks_PropertyGet() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ImplicitVariantReturnTypeInspection(parseResult.State); + var inspection = new ImplicitVariantReturnTypeInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/MultilineParameterInspectionTests.cs b/RubberduckTests/Inspections/MultilineParameterInspectionTests.cs index 3822029729..da152baa6a 100644 --- a/RubberduckTests/Inspections/MultilineParameterInspectionTests.cs +++ b/RubberduckTests/Inspections/MultilineParameterInspectionTests.cs @@ -40,14 +40,14 @@ As _ var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultilineParameterInspection(parseResult.State); + var inspection = new MultilineParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ public void MultilineParameter_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultilineParameterInspection(parseResult.State); + var inspection = new MultilineParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -100,14 +100,14 @@ As _ var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultilineParameterInspection(parseResult.State); + var inspection = new MultilineParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -129,14 +129,14 @@ As _ var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultilineParameterInspection(parseResult.State); + var inspection = new MultilineParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -166,14 +166,14 @@ As _ var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultilineParameterInspection(parseResult.State); + var inspection = new MultilineParameterInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/MultipleDeclarationsInspectionTests.cs b/RubberduckTests/Inspections/MultipleDeclarationsInspectionTests.cs index 9d663ef4e1..26e6f75b69 100644 --- a/RubberduckTests/Inspections/MultipleDeclarationsInspectionTests.cs +++ b/RubberduckTests/Inspections/MultipleDeclarationsInspectionTests.cs @@ -38,14 +38,14 @@ public void MultipleDeclarations_ReturnsResult_Variables() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -65,14 +65,14 @@ public void MultipleDeclarations_ReturnsResult_Constants() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -92,14 +92,14 @@ public void MultipleDeclarations_ReturnsResult_StaticVariables() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -120,14 +120,14 @@ public void MultipleDeclarations_ReturnsResult_MultipleDeclarations() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -148,14 +148,14 @@ Dim var3 As Boolean var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -184,14 +184,14 @@ Dim var2 As String var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); @@ -222,14 +222,14 @@ public void MultipleDeclarations_QuickFixWorks_Constants() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); @@ -260,14 +260,14 @@ Static var2 As String var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new MultipleDeclarationsInspection(parseResult.State); + var inspection = new MultipleDeclarationsInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs b/RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs index 6235b76938..5127f9cf96 100644 --- a/RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs +++ b/RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs @@ -37,14 +37,14 @@ public void NonReturningFunction_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ Function Goo() As String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -93,14 +93,14 @@ public void NonReturningFunction_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -123,14 +123,14 @@ Function Goo() As String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -159,14 +159,14 @@ Function IClass1_Foo() As Boolean var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -191,14 +191,14 @@ public void NonReturningFunction_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); @@ -229,14 +229,14 @@ Function IClass1_Foo() As Boolean var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new NonReturningFunctionInspection(parseResult.State); + var inspection = new NonReturningFunctionInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.First().QuickFixes.Count()); diff --git a/RubberduckTests/Inspections/ObsoleteCallStatementInspectionTests.cs b/RubberduckTests/Inspections/ObsoleteCallStatementInspectionTests.cs index 104209574f..5d5a621570 100644 --- a/RubberduckTests/Inspections/ObsoleteCallStatementInspectionTests.cs +++ b/RubberduckTests/Inspections/ObsoleteCallStatementInspectionTests.cs @@ -38,14 +38,14 @@ Call Foo var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCallStatementInspection(parseResult.State); + var inspection = new ObsoleteCallStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -65,14 +65,14 @@ public void ObsoleteCallStatement_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCallStatementInspection(parseResult.State); + var inspection = new ObsoleteCallStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -96,14 +96,14 @@ Call Foo var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCallStatementInspection(parseResult.State); + var inspection = new ObsoleteCallStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -127,14 +127,14 @@ Sub Goo(arg1 As Integer, arg1 As String) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCallStatementInspection(parseResult.State); + var inspection = new ObsoleteCallStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -169,14 +169,14 @@ Sub Goo(arg1 As Integer, arg1 As String) var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCallStatementInspection(parseResult.State); + var inspection = new ObsoleteCallStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); foreach (var inspectionResult in inspectionResults) diff --git a/RubberduckTests/Inspections/ObsoleteCommentSyntaxInspectionTests.cs b/RubberduckTests/Inspections/ObsoleteCommentSyntaxInspectionTests.cs index dd1991f5c2..415da0208e 100644 --- a/RubberduckTests/Inspections/ObsoleteCommentSyntaxInspectionTests.cs +++ b/RubberduckTests/Inspections/ObsoleteCommentSyntaxInspectionTests.cs @@ -35,14 +35,14 @@ public void ObsoleteCommentSyntax_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCommentSyntaxInspection(parseResult.State); + var inspection = new ObsoleteCommentSyntaxInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -59,14 +59,14 @@ public void ObsoleteCommentSyntax_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCommentSyntaxInspection(parseResult.State); + var inspection = new ObsoleteCommentSyntaxInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -85,14 +85,14 @@ public void ObsoleteCommentSyntax_ReturnsMultipleResults() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCommentSyntaxInspection(parseResult.State); + var inspection = new ObsoleteCommentSyntaxInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -111,14 +111,14 @@ public void ObsoleteCommentSyntax_ReturnsResults_SomeObsoleteCommentSyntax() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCommentSyntaxInspection(parseResult.State); + var inspection = new ObsoleteCommentSyntaxInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -141,14 +141,14 @@ public void ObsoleteCommentSyntax_QuickFixWorks_UpdateComment() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCommentSyntaxInspection(parseResult.State); + var inspection = new ObsoleteCommentSyntaxInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); @@ -173,14 +173,14 @@ public void ObsoleteCommentSyntax_QuickFixWorks_RemoveComment() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteCommentSyntaxInspection(parseResult.State); + var inspection = new ObsoleteCommentSyntaxInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.ElementAt(1).Fix(); diff --git a/RubberduckTests/Inspections/ObsoleteGlobalInspectionTests.cs b/RubberduckTests/Inspections/ObsoleteGlobalInspectionTests.cs index 0be6052945..b4e91dd44a 100644 --- a/RubberduckTests/Inspections/ObsoleteGlobalInspectionTests.cs +++ b/RubberduckTests/Inspections/ObsoleteGlobalInspectionTests.cs @@ -36,14 +36,14 @@ public void ObsoleteGlobal_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteGlobalInspection(parseResult.State); + var inspection = new ObsoleteGlobalInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -62,14 +62,14 @@ public void ObsoleteGlobal_ReturnsResult_MultipleGlobals() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteGlobalInspection(parseResult.State); + var inspection = new ObsoleteGlobalInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -87,14 +87,14 @@ public void ObsoleteGlobal_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteGlobalInspection(parseResult.State); + var inspection = new ObsoleteGlobalInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -113,14 +113,14 @@ public void ObsoleteGlobal_ReturnsResult_SomeConstantsUsed() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteGlobalInspection(parseResult.State); + var inspection = new ObsoleteGlobalInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -143,14 +143,14 @@ public void ObsoleteGlobal_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteGlobalInspection(parseResult.State); + var inspection = new ObsoleteGlobalInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/ObsoleteLetStatementInspectionTests.cs b/RubberduckTests/Inspections/ObsoleteLetStatementInspectionTests.cs index 5642854f79..fbca6edb78 100644 --- a/RubberduckTests/Inspections/ObsoleteLetStatementInspectionTests.cs +++ b/RubberduckTests/Inspections/ObsoleteLetStatementInspectionTests.cs @@ -41,14 +41,14 @@ Dim var2 As Integer var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteLetStatementInspection(parseResult.State); + var inspection = new ObsoleteLetStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -72,14 +72,14 @@ Dim var2 As Integer var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteLetStatementInspection(parseResult.State); + var inspection = new ObsoleteLetStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -102,14 +102,14 @@ Dim var2 As Integer var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteLetStatementInspection(parseResult.State); + var inspection = new ObsoleteLetStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -133,14 +133,14 @@ Dim var2 As Integer var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteLetStatementInspection(parseResult.State); + var inspection = new ObsoleteLetStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -173,14 +173,14 @@ Dim var2 As Integer var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ObsoleteLetStatementInspection(parseResult.State); + var inspection = new ObsoleteLetStatementInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/OptionExplicitInspectionTests.cs b/RubberduckTests/Inspections/OptionExplicitInspectionTests.cs index 0c7480d9fe..40eedd0b7a 100644 --- a/RubberduckTests/Inspections/OptionExplicitInspectionTests.cs +++ b/RubberduckTests/Inspections/OptionExplicitInspectionTests.cs @@ -35,14 +35,14 @@ public void NotAlreadySpecified_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new OptionExplicitInspection(parseResult.State); + var inspection = new OptionExplicitInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -59,14 +59,14 @@ public void AlreadySpecified_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new OptionExplicitInspection(parseResult.State); + var inspection = new OptionExplicitInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -87,14 +87,14 @@ public void NotAlreadySpecified_ReturnsMultipleResults() var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new OptionExplicitInspection(parseResult.State); + var inspection = new OptionExplicitInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -116,14 +116,14 @@ public void PartiallySpecified_ReturnsResults() var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new OptionExplicitInspection(parseResult.State); + var inspection = new OptionExplicitInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -146,14 +146,14 @@ public void NotAlreadySpecified_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new OptionExplicitInspection(parseResult.State); + var inspection = new OptionExplicitInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/ParameterCanBeByValInspectionTests.cs b/RubberduckTests/Inspections/ParameterCanBeByValInspectionTests.cs index b60f146a5b..deec66dbb1 100644 --- a/RubberduckTests/Inspections/ParameterCanBeByValInspectionTests.cs +++ b/RubberduckTests/Inspections/ParameterCanBeByValInspectionTests.cs @@ -37,14 +37,14 @@ public void ParameterCanByByVal_ReturnsResult_PassedByNotSpecified() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -63,14 +63,14 @@ public void ParameterCanByByVal_ReturnsResult_PassedByRef_Unassigned() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -89,14 +89,14 @@ public void ParameterCanByByVal_ReturnsResult_Multiple() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -115,14 +115,14 @@ public void ParameterCanByByVal_DoesNotReturnResult_PassedByValExplicitly() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -142,14 +142,14 @@ public void ParameterCanByByVal_DoesNotReturnResult_PassedByRefAndAssigned() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -168,14 +168,14 @@ public void ParameterCanByByVal_ReturnsResult_SomeParams() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -200,14 +200,14 @@ public void ParameterCanByByVal_ReturnsResult_QuickFixWorks_PassedByUnspecified( var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); inspection.GetInspectionResults().First().QuickFixes.First().Fix(); Assert.AreEqual(expectedCode, module.Lines()); @@ -232,14 +232,14 @@ public void ParameterCanByByVal_ReturnsResult_QuickFixWorks_PassedByRefUnassigne var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterCanBeByValInspection(parseResult.State); + var inspection = new ParameterCanBeByValInspection(parser.State); inspection.GetInspectionResults().First().QuickFixes.First().Fix(); Assert.AreEqual(expectedCode, module.Lines()); diff --git a/RubberduckTests/Inspections/ParameterNotUsedInspectionTests.cs b/RubberduckTests/Inspections/ParameterNotUsedInspectionTests.cs index 4269b76367..03e9b57a46 100644 --- a/RubberduckTests/Inspections/ParameterNotUsedInspectionTests.cs +++ b/RubberduckTests/Inspections/ParameterNotUsedInspectionTests.cs @@ -37,14 +37,14 @@ public void ParameterNotUsed_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterNotUsedInspection(vbe.Object, parseResult.State, null); + var inspection = new ParameterNotUsedInspection(vbe.Object, parser.State, null); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ Private Sub Goo(ByVal arg1 as Integer) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterNotUsedInspection(vbe.Object, parseResult.State, null); + var inspection = new ParameterNotUsedInspection(vbe.Object, parser.State, null); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -93,14 +93,14 @@ public void ParameterUsed_DoesNotReturnResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterNotUsedInspection(vbe.Object, parseResult.State, null); + var inspection = new ParameterNotUsedInspection(vbe.Object, parser.State, null); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -120,14 +120,14 @@ public void ParameterNotUsed_ReturnsResult_SomeParamsUsed() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterNotUsedInspection(vbe.Object, parseResult.State, null); + var inspection = new ParameterNotUsedInspection(vbe.Object, parser.State, null); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -156,14 +156,14 @@ Private Sub IClass1_DoSomething(ByVal a As Integer) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterNotUsedInspection(vbe.Object, parseResult.State, null); + var inspection = new ParameterNotUsedInspection(vbe.Object, parser.State, null); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -188,14 +188,14 @@ public void ParameterNotUsed_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ParameterNotUsedInspection(vbe.Object, parseResult.State, null); + var inspection = new ParameterNotUsedInspection(vbe.Object, parser.State, null); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/ProcedureNotUsedInspectionTests.cs b/RubberduckTests/Inspections/ProcedureNotUsedInspectionTests.cs index 736e3d889b..4f0aa6855e 100644 --- a/RubberduckTests/Inspections/ProcedureNotUsedInspectionTests.cs +++ b/RubberduckTests/Inspections/ProcedureNotUsedInspectionTests.cs @@ -37,14 +37,14 @@ public void ProcedureNotUsed_ReturnsResult() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ Private Sub Goo() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -97,14 +97,14 @@ Private Sub Goo() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -127,14 +127,14 @@ Private Sub Goo() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -163,14 +163,14 @@ Private Sub IClass1_DoSomething(ByVal a As Integer) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -198,14 +198,14 @@ Private Sub abc_Foo(ByVal arg1 As Integer, ByVal arg2 As String) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -225,14 +225,14 @@ public void ProcedureNotUsed_ReturnsResult_PublicModuleMember() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -255,14 +255,14 @@ public void ProcedureNotUsed_QuickFixWorks() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new ProcedureNotUsedInspection(parseResult.State); + var inspection = new ProcedureNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); inspectionResults.First().QuickFixes.First().Fix(); diff --git a/RubberduckTests/Inspections/VariableIsNeverAssignedInspectionTests.cs b/RubberduckTests/Inspections/VariableIsNeverAssignedInspectionTests.cs index 57c5f2943b..7dd25b3fe7 100644 --- a/RubberduckTests/Inspections/VariableIsNeverAssignedInspectionTests.cs +++ b/RubberduckTests/Inspections/VariableIsNeverAssignedInspectionTests.cs @@ -38,14 +38,14 @@ Dim var1 As String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotAssignedInspection(parseResult.State); + var inspection = new VariableNotAssignedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ Dim var2 As Date var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotAssignedInspection(parseResult.State); + var inspection = new VariableNotAssignedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -94,14 +94,14 @@ Dim var1 as String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotAssignedInspection(parseResult.State); + var inspection = new VariableNotAssignedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -124,14 +124,14 @@ Dim var2 as String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotAssignedInspection(parseResult.State); + var inspection = new VariableNotAssignedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -157,14 +157,14 @@ Dim var1 as Integer var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotAssignedInspection(parseResult.State); + var inspection = new VariableNotAssignedInspection(parser.State); inspection.GetInspectionResults().First().QuickFixes.First().Fix(); Assert.AreEqual(expectedCode, module.Lines()); diff --git a/RubberduckTests/Inspections/VariableNeverUsedInspectionTests.cs b/RubberduckTests/Inspections/VariableNeverUsedInspectionTests.cs index 7d407f295d..fa35c728d5 100644 --- a/RubberduckTests/Inspections/VariableNeverUsedInspectionTests.cs +++ b/RubberduckTests/Inspections/VariableNeverUsedInspectionTests.cs @@ -38,14 +38,14 @@ Dim var1 As String var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotUsedInspection(parseResult.State); + var inspection = new VariableNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -66,14 +66,14 @@ Dim var2 As Date var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotUsedInspection(parseResult.State); + var inspection = new VariableNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -99,14 +99,14 @@ Sub Goo(ByVal arg1 As String) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotUsedInspection(parseResult.State); + var inspection = new VariableNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -134,14 +134,14 @@ Sub Goo(ByVal arg1 As Integer) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotUsedInspection(parseResult.State); + var inspection = new VariableNotUsedInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -167,14 +167,14 @@ Dim var1 As String var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableNotUsedInspection(parseResult.State); + var inspection = new VariableNotUsedInspection(parser.State); inspection.GetInspectionResults().First().QuickFixes.First().Fix(); Assert.AreEqual(expectedCode, module.Lines()); diff --git a/RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs b/RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs index e922407f4c..e42115260b 100644 --- a/RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs +++ b/RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs @@ -37,14 +37,14 @@ public void VariableTypeNotDeclared_ReturnsResult_Parameter() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -63,14 +63,14 @@ public void VariableTypeNotDeclared_ReturnsResult_MultipleParams() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -89,14 +89,14 @@ public void VariableTypeNotDeclared_DoesNotReturnResult_Parameter() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -115,14 +115,14 @@ public void VariableTypeNotDeclared_ReturnsResult_SomeTypesNotDeclared_Parameter var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -147,14 +147,14 @@ public void VariableTypeNotDeclared_ReturnsResult_QuickFixWorks_Parameter() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); inspection.GetInspectionResults().First().QuickFixes.First().Fix(); var actual = module.Lines(); @@ -175,14 +175,14 @@ Dim var1 var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -203,14 +203,14 @@ Dim var2 var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(2, inspectionResults.Count()); @@ -230,14 +230,14 @@ Dim var1 As Integer var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(0, inspectionResults.Count()); @@ -258,14 +258,14 @@ Dim var2 As Date var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); var inspectionResults = inspection.GetInspectionResults(); Assert.AreEqual(1, inspectionResults.Count()); @@ -292,14 +292,14 @@ Dim var1 As Variant var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; - var inspection = new VariableTypeNotDeclaredInspection(parseResult.State); + var inspection = new VariableTypeNotDeclaredInspection(parser.State); inspection.GetInspectionResults().First().QuickFixes.First().Fix(); Assert.AreEqual(expectedCode, module.Lines()); diff --git a/RubberduckTests/Refactoring/ExtractMethodTests.cs b/RubberduckTests/Refactoring/ExtractMethodTests.cs index 83a33b5c80..85331f7622 100644 --- a/RubberduckTests/Refactoring/ExtractMethodTests.cs +++ b/RubberduckTests/Refactoring/ExtractMethodTests.cs @@ -60,15 +60,15 @@ End Function var mockHost = new Mock(); mockHost.SetupAllProperties(); var editor = new ActiveCodePaneEditor(module.VBE, codePaneFactory); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(module.Parent), new Selection(4, 1, 4, 20)); - var model = new ExtractMethodModel(editor, parseResult.State.AllDeclarations, qualifiedSelection); + var model = new ExtractMethodModel(editor, parser.State.AllDeclarations, qualifiedSelection); model.Method.Accessibility = Accessibility.Private; model.Method.MethodName = "Bar"; model.Method.ReturnValue = new ExtractedParameter("Integer", ExtractedParameter.PassedBy.ByVal, "x"); diff --git a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs index 5f1aaaef4a..5bccff9692 100644 --- a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs +++ b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs @@ -1,12 +1,69 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Threading; +using Microsoft.Vbe.Interop; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Moq; +using Rubberduck.Parsing.VBA; +using Rubberduck.Refactorings.IntroduceParameter; +using Rubberduck.VBEditor; +using Rubberduck.VBEditor.Extensions; +using Rubberduck.VBEditor.VBEHost; +using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane; +using RubberduckTests.Mocks; namespace RubberduckTests.Refactoring { - class PromoteLocalToParameter + [TestClass] + public class PromoteLocalToParameter { + private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(0, 1); + + void State_StateChanged(object sender, ParserStateEventArgs e) + { + if (e.State == ParserState.Ready) + { + _semaphore.Release(); + } + } + + [TestMethod] + public void PromoteLocalToParameterRefactoring_NoParamsInList() + { + //Input + const string inputCode = +@"Private Sub Foo() + Dim bar As Boolean +End Sub"; + var selection = new Selection(2, 10, 2, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal bar As Boolean) +End Sub"; + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } } } diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs index d61f883560..f8045880f8 100644 --- a/RubberduckTests/Refactoring/RemoveParametersTests.cs +++ b/RubberduckTests/Refactoring/RemoveParametersTests.cs @@ -54,17 +54,17 @@ public void RemoveParametersRefactoring_RemoveBothParams() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters.ForEach(arg => arg.IsRemoved = true); //SetupFactory @@ -100,17 +100,17 @@ public void RemoveParametersRefactoring_RemoveOnlyParam() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters.ForEach(arg => arg.IsRemoved = true); //SetupFactory @@ -146,17 +146,17 @@ public void RemoveParametersRefactoring_RemoveFirstParam() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -192,17 +192,17 @@ public void RemoveParametersRefactoring_RemoveSecondParam() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -248,17 +248,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[2].IsRemoved = true; //SetupFactory @@ -294,17 +294,17 @@ public void RemoveParametersRefactoring_RemoveLastFromFunction() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -340,17 +340,17 @@ public void RemoveParametersRefactoring_RemoveAllFromFunction() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters.ForEach(p => p.IsRemoved = true); //SetupFactory @@ -396,17 +396,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters.ForEach(p => p.IsRemoved = true); //SetupFactory @@ -442,17 +442,17 @@ public void RemoveParametersRefactoring_RemoveFromGetter() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters.ForEach(p => p.IsRemoved = true); //SetupFactory @@ -488,24 +488,24 @@ public void RemoveParametersRefactoring_QuickFix() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); //SetupFactory var factory = SetupFactory(model); //Act var refactoring = new RemoveParametersRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory)); - refactoring.QuickFix(parseResult.State, qualifiedSelection); + refactoring.QuickFix(parser.State, qualifiedSelection); //Assert Assert.AreEqual(expectedCode, module.Lines()); @@ -533,17 +533,17 @@ public void RemoveParametersRefactoring_RemoveFirstParamFromSetter() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -589,17 +589,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -645,17 +645,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -713,17 +713,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -752,16 +752,16 @@ public void RemoveParametersRefactoring_RemoveLastParamFromSetter_NotAllowed() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); // Assert Assert.AreEqual(1, model.Parameters.Count); // doesn't allow removing last param from setter @@ -782,16 +782,16 @@ public void RemoveParametersRefactoring_RemoveLastParamFromLetter_NotAllowed() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); // Assert Assert.AreEqual(1, model.Parameters.Count); // doesn't allow removing last param from letter @@ -826,17 +826,17 @@ Private Property Set Foo( ByVal arg2 As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -879,17 +879,17 @@ Private Property Let Foo( ByVal arg2 As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -933,17 +933,17 @@ Private Sub Goo(ByVal arg1 As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -981,17 +981,17 @@ public void RemoveParametersRefactoring_SignatureOnMultipleLines() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -1029,17 +1029,17 @@ public void RemoveParametersRefactoring_SignatureOnMultipleLines_RemoveSecond() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1077,17 +1077,17 @@ public void RemoveParametersRefactoring_SignatureOnMultipleLines_RemoveLast() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[2].IsRemoved = true; //SetupFactory @@ -1125,17 +1125,17 @@ public void RemoveParametersRefactoring_PassTargetIn() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -1187,17 +1187,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[0].IsRemoved = true; //SetupFactory @@ -1248,12 +1248,12 @@ Private Sub IClass1_DoSomething(ByVal a As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1261,7 +1261,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer ) var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1313,12 +1313,12 @@ Private Sub IClass1_DoSomething(ByVal v1 As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1326,7 +1326,7 @@ Private Sub IClass1_DoSomething(ByVal v1 As Integer ) var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1389,12 +1389,12 @@ Private Sub IClass1_DoSomething(ByVal i As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1403,7 +1403,7 @@ Private Sub IClass1_DoSomething(ByVal i As Integer ) var module3 = project.Object.VBComponents.Item(2).CodeModule; //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1456,12 +1456,12 @@ Private Sub abc_Foo(ByVal arg1 As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1469,7 +1469,7 @@ Private Sub abc_Foo(ByVal arg1 As Integer ) var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1521,12 +1521,12 @@ Private Sub abc_Foo(ByVal i As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1534,7 +1534,7 @@ Private Sub abc_Foo(ByVal i As Integer ) var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1597,12 +1597,12 @@ Private Sub abc_Foo(ByVal v1 As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1611,7 +1611,7 @@ Private Sub abc_Foo(ByVal v1 As Integer ) var module3 = project.Object.VBComponents.Item(2).CodeModule; //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1665,12 +1665,12 @@ Private Sub IClass1_DoSomething(ByVal a As Integer ) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1682,7 +1682,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer ) .Returns(DialogResult.Yes); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, messageBox.Object); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, messageBox.Object); model.Parameters[1].IsRemoved = true; //SetupFactory @@ -1723,12 +1723,12 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1737,7 +1737,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String) .Returns(DialogResult.No); //Specify Params to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, messageBox.Object); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, messageBox.Object); Assert.IsNull(model.TargetDeclaration); } @@ -1757,17 +1757,17 @@ public void RemoveParams_RefactorDeclaration_FailsInvalidTarget() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); var factory = SetupFactory(model); @@ -1806,18 +1806,18 @@ public void RemoveParams_PresenterIsNull() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns((QualifiedSelection?)null); var factory = new RemoveParametersPresenterFactory(editor.Object, null, - parseResult.State, null); + parser.State, null); //act var refactoring = new RemoveParametersRefactoring(factory, new ActiveCodePaneEditor(vbe.Object, codePaneFactory)); @@ -1843,17 +1843,17 @@ public void RemoveParams_ModelIsNull() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to remove - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, null); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, null); //SetupFactory var factory = SetupFactory(model); @@ -1881,26 +1881,26 @@ public void Presenter_Accept_ReturnsModelWithParametersChanged() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, new MessageBox()); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, new MessageBox()); model.Parameters[1].IsRemoved = true; var view = new Mock(); view.Setup(v => v.ShowDialog()).Returns(DialogResult.OK); view.Setup(v => v.Parameters).Returns(model.Parameters); - var factory = new RemoveParametersPresenterFactory(editor.Object, view.Object, parseResult.State, null); + var factory = new RemoveParametersPresenterFactory(editor.Object, view.Object, parser.State, null); var presenter = factory.Create(); @@ -1922,26 +1922,26 @@ public void Presenter_Reject_ReturnsNull() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, new MessageBox()); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, new MessageBox()); model.Parameters[1].IsRemoved = true; var view = new Mock(); view.Setup(v => v.ShowDialog()).Returns(DialogResult.Cancel); view.Setup(v => v.Parameters).Returns(model.Parameters); - var factory = new RemoveParametersPresenterFactory(editor.Object, view.Object, parseResult.State, null); + var factory = new RemoveParametersPresenterFactory(editor.Object, view.Object, parser.State, null); var presenter = factory.Create(); @@ -1963,22 +1963,22 @@ public void Presenter_Accept_AutoMarksSingleParamAsRemoved() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var model = new RemoveParametersModel(parseResult.State, qualifiedSelection, new MessageBox()); + var model = new RemoveParametersModel(parser.State, qualifiedSelection, new MessageBox()); model.Parameters[0].IsRemoved = true; - var factory = new RemoveParametersPresenterFactory(editor.Object, null, parseResult.State, null); + var factory = new RemoveParametersPresenterFactory(editor.Object, null, parser.State, null); var presenter = factory.Create(); @@ -2004,12 +2004,12 @@ public void Presenter_ParameterlessTargetReturnsNullModel() var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var codePane = project.Object.VBComponents.Item(0).CodeModule.CodePane; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(codePane.CodeModule.Parent), selection); @@ -2020,7 +2020,7 @@ public void Presenter_ParameterlessTargetReturnsNullModel() var messageBox = new Mock(); messageBox.Setup(m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(DialogResult.OK); - var factory = new RemoveParametersPresenterFactory(editor.Object, null, parseResult.State, messageBox.Object); + var factory = new RemoveParametersPresenterFactory(editor.Object, null, parser.State, messageBox.Object); var presenter = factory.Create(); Assert.AreEqual(null, presenter.Show()); @@ -2047,12 +2047,12 @@ Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var codePane = project.Object.VBComponents.Item(0).CodeModule.CodePane; var ext = codePaneFactory.Create(codePane); @@ -2063,7 +2063,7 @@ Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String) var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var factory = new RemoveParametersPresenterFactory(editor.Object, null, parseResult.State, null); + var factory = new RemoveParametersPresenterFactory(editor.Object, null, parser.State, null); var presenter = factory.Create(); @@ -2088,17 +2088,17 @@ public void Factory_NullSelectionNullReturnsNullPresenter() var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns((QualifiedSelection?)null); - var factory = new RemoveParametersPresenterFactory(editor.Object, null, parseResult.State, null); + var factory = new RemoveParametersPresenterFactory(editor.Object, null, parser.State, null); Assert.AreEqual(null, factory.Create()); } diff --git a/RubberduckTests/Refactoring/RenameTests.cs b/RubberduckTests/Refactoring/RenameTests.cs index d16fda887e..0fc25d680f 100644 --- a/RubberduckTests/Refactoring/RenameTests.cs +++ b/RubberduckTests/Refactoring/RenameTests.cs @@ -53,22 +53,22 @@ public void RenameRefactoring_RenameSub() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -101,22 +101,22 @@ Dim val2 As Integer var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "val2" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "val2" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -146,22 +146,22 @@ public void RenameRefactoring_RenameParameter() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "arg2" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "arg2" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -201,22 +201,22 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Hoo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Hoo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -250,22 +250,22 @@ Dim val2 As Integer var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "val2" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "val2" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -297,22 +297,22 @@ public void RenameRefactoring_RenameParameter_UpdatesReferences() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "arg2" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "arg2" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -348,22 +348,22 @@ Private Property Set Goo(ByVal arg1 As Integer, ByVal arg2 As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -399,22 +399,22 @@ Private Property Let Goo(ByVal arg1 As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -446,22 +446,22 @@ public void RenameRefactoring_RenameFunction() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -505,22 +505,22 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Hoo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Hoo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -550,22 +550,22 @@ public void RenameRefactoring_RefactorWithDeclaration() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(model.Target); //Assert @@ -609,25 +609,25 @@ Private Sub IClass1_DoNothing(ByVal a As Integer, ByVal b As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; var module2 = project.Object.VBComponents.Item(1).CodeModule; - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "DoNothing" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "DoNothing" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -670,25 +670,25 @@ Private Sub abc_Goo(ByVal i As Integer, ByVal s As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; var module2 = project.Object.VBComponents.Item(1).CodeModule; - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -733,12 +733,12 @@ Private Sub IClass1_DoNothing(ByVal a As Integer, ByVal b As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -750,13 +750,13 @@ Private Sub IClass1_DoNothing(ByVal a As Integer, ByVal b As String) m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(DialogResult.Yes); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, messageBox.Object) { NewName = "DoNothing" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, messageBox.Object) { NewName = "DoNothing" }; //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(model.Selection); //Assert @@ -790,12 +790,12 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -804,7 +804,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String) m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(DialogResult.No); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, messageBox.Object); + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, messageBox.Object); Assert.AreEqual(null, model.Target); } @@ -825,12 +825,12 @@ public void Rename_PresenterIsNull() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; int startLine, startColumn, endLine, endColumn; @@ -839,10 +839,10 @@ public void Rename_PresenterIsNull() codePaneMock.Setup(c => c.GetSelection(out startLine, out startColumn, out endLine, out endColumn)); vbe.Setup(v => v.ActiveCodePane).Returns(codePaneMock.Object); - var factory = new RenamePresenterFactory(vbe.Object, null, parseResult.State, null, codePaneFactory); + var factory = new RenamePresenterFactory(vbe.Object, null, parser.State, null, codePaneFactory); //act - var refactoring = new RenameRefactoring(factory, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(); Assert.AreEqual(inputCode, module.Lines()); @@ -866,12 +866,12 @@ Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; int startLine, startColumn, endLine, endColumn; @@ -880,7 +880,7 @@ Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String) codePaneMock.Setup(c => c.GetSelection(out startLine, out startColumn, out endLine, out endColumn)); vbe.Setup(v => v.ActiveCodePane).Returns(codePaneMock.Object); - var factory = new RenamePresenterFactory(vbe.Object, null, parseResult.State, null, codePaneFactory); + var factory = new RenamePresenterFactory(vbe.Object, null, parser.State, null, codePaneFactory); var presenter = factory.Create(); @@ -904,12 +904,12 @@ public void Factory_SelectionIsNull() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns((QualifiedSelection?)null); @@ -921,7 +921,7 @@ public void Factory_SelectionIsNull() codePaneMock.Setup(c => c.GetSelection(out startLine, out startColumn, out endLine, out endColumn)); vbe.Setup(v => v.ActiveCodePane).Returns(codePaneMock.Object); - var factory = new RenamePresenterFactory(vbe.Object, null, parseResult.State, null, codePaneFactory); + var factory = new RenamePresenterFactory(vbe.Object, null, parser.State, null, codePaneFactory); var presenter = factory.Create(); Assert.AreEqual(null, presenter.Show()); @@ -946,16 +946,16 @@ public void Factory_SelectionIsNotNull_Accept() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = newName }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = newName }; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); @@ -979,7 +979,7 @@ public void Factory_SelectionIsNotNull_Accept() view.Setup(v => v.NewName).Returns(newName); view.Setup(v => v.ShowDialog()).Returns(DialogResult.OK); - var factory = new RenamePresenterFactory(vbe.Object, view.Object, parseResult.State, null, codePaneFactoryMock.Object); + var factory = new RenamePresenterFactory(vbe.Object, view.Object, parser.State, null, codePaneFactoryMock.Object); var presenter = factory.Create(); Assert.AreEqual(model.NewName, presenter.Show().NewName); @@ -1002,12 +1002,12 @@ public void Factory_SelectionIsNotNull_Reject() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1033,7 +1033,7 @@ public void Factory_SelectionIsNotNull_Reject() view.Setup(v => v.NewName).Returns("Goo"); view.Setup(v => v.ShowDialog()).Returns(DialogResult.Cancel); - var factory = new RenamePresenterFactory(vbe.Object, view.Object, parseResult.State, null, codePaneFactoryMock.Object); + var factory = new RenamePresenterFactory(vbe.Object, view.Object, parser.State, null, codePaneFactoryMock.Object); var presenter = factory.Create(); Assert.AreEqual(null, presenter.Show()); @@ -1058,16 +1058,16 @@ public void Factory_SelectionIsNotNull_PassInTarget_Accept() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = newName }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = newName }; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); @@ -1091,7 +1091,7 @@ public void Factory_SelectionIsNotNull_PassInTarget_Accept() view.Setup(v => v.NewName).Returns(newName); view.Setup(v => v.ShowDialog()).Returns(DialogResult.OK); - var factory = new RenamePresenterFactory(vbe.Object, view.Object, parseResult.State, null, codePaneFactoryMock.Object); + var factory = new RenamePresenterFactory(vbe.Object, view.Object, parser.State, null, codePaneFactoryMock.Object); var presenter = factory.Create(); Assert.AreEqual(model.NewName, presenter.Show(model.Target).NewName); @@ -1114,16 +1114,16 @@ public void Factory_SelectionIsNotNull_PassInTarget_Reject() var module = project.VBComponents.Item(0).CodeModule; var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); @@ -1146,7 +1146,7 @@ public void Factory_SelectionIsNotNull_PassInTarget_Reject() var view = new Mock(); view.Setup(v => v.ShowDialog()).Returns(DialogResult.Cancel); - var factory = new RenamePresenterFactory(vbe.Object, view.Object, parseResult.State, null, codePaneFactoryMock.Object); + var factory = new RenamePresenterFactory(vbe.Object, view.Object, parser.State, null, codePaneFactoryMock.Object); var presenter = factory.Create(); Assert.AreEqual(null, presenter.Show(model.Target)); @@ -1172,23 +1172,23 @@ public void RenameRefactoring_RenameProject() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = newName }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = newName }; model.Target = model.Declarations.First(i => i.DeclarationType == DeclarationType.Project && !i.IsBuiltIn); //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(model.Target); //Assert @@ -1220,16 +1220,16 @@ Dim Goo As Integer var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); @@ -1241,7 +1241,7 @@ Dim Goo As Integer It.IsAny())).Returns(DialogResult.No); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), messageBox.Object, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), messageBox.Object, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -1273,16 +1273,16 @@ Dim Goo As Integer var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = "Goo" }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = "Goo" }; //SetupFactory var factory = SetupFactory(model); @@ -1294,7 +1294,7 @@ Dim Goo As Integer It.IsAny())).Returns(DialogResult.Yes); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), messageBox.Object, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), messageBox.Object, parser.State); refactoring.Refactor(qualifiedSelection); //Assert @@ -1324,23 +1324,23 @@ public void RenameRefactoring_RenameCodeModule() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new RenameModel(vbe.Object, parseResult.State, qualifiedSelection, null) { NewName = newName }; + var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = newName }; model.Target = model.Declarations.FirstOrDefault(i => i.DeclarationType == DeclarationType.Class && i.IdentifierName == "Class1"); //SetupFactory var factory = SetupFactory(model); //Act - var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parseResult.State); + var refactoring = new RenameRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null, parser.State); refactoring.Refactor(model.Target); //Assert diff --git a/RubberduckTests/Refactoring/ReorderParametersTests.cs b/RubberduckTests/Refactoring/ReorderParametersTests.cs index 76f6f26c36..c8b861c0ed 100644 --- a/RubberduckTests/Refactoring/ReorderParametersTests.cs +++ b/RubberduckTests/Refactoring/ReorderParametersTests.cs @@ -55,17 +55,17 @@ public void ReorderParams_SwapPositions() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); var factory = SetupFactory(model); @@ -101,17 +101,17 @@ public void ReorderParams_RefactorDeclaration() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); var factory = SetupFactory(model); @@ -140,17 +140,17 @@ public void ReorderParams_RefactorDeclaration_FailsInvalidTarget() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); var factory = SetupFactory(model); @@ -197,17 +197,17 @@ public void ReorderParams_WithOptionalParam() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -260,17 +260,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); var factory = SetupFactory(model); @@ -316,17 +316,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[0], @@ -372,17 +372,17 @@ public void ReorderParametersRefactoring_ReorderNamedParams_Function() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -429,17 +429,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -483,17 +483,17 @@ public void ReorderParametersRefactoring_ReorderGetter() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -537,17 +537,17 @@ public void ReorderParametersRefactoring_ReorderLetter() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -584,17 +584,17 @@ public void ReorderParametersRefactoring_ReorderSetter() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -623,16 +623,16 @@ public void ReorderParametersRefactoring_ReorderLastParamFromSetter_NotAllowed() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); // Assert Assert.AreEqual(1, model.Parameters.Count); // doesn't allow removing last param from setter @@ -653,16 +653,16 @@ public void ReorderParametersRefactoring_ReorderLastParamFromLetter_NotAllowed() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); // Assert Assert.AreEqual(1, model.Parameters.Count); // doesn't allow removing last param from letter @@ -693,17 +693,17 @@ public void ReorderParametersRefactoring_SignatureOnMultipleLines() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -756,17 +756,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -809,17 +809,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -883,17 +883,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -971,17 +971,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -1023,17 +1023,17 @@ public void ReorderParams_MoveOptionalParamBeforeNonOptionalParamFails() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -1089,17 +1089,17 @@ End Sub var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //set up model - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); var reorderedParams = new List() { model.Parameters[1], @@ -1148,17 +1148,17 @@ Private Property Set Foo(ByVal arg2 As String, ByVal arg1 As Integer, ByVal arg3 var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Param(s) to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1201,17 +1201,17 @@ Private Property Let Foo(ByVal arg2 As String, ByVal arg1 As Integer, ByVal arg3 var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); //Specify Params to reorder - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1242,18 +1242,18 @@ public void ReorderParams_PresenterIsNull() var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns((QualifiedSelection?)null); var factory = new ReorderParametersPresenterFactory(editor.Object, null, - parseResult.State, null); + parser.State, null); //act var refactoring = new ReorderParametersRefactoring(factory, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); @@ -1299,19 +1299,19 @@ Private Sub IClass1_DoSomething(ByVal b As String, ByVal a As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1363,19 +1363,19 @@ Private Sub IClass1_DoSomething(ByVal v2 As String, ByVal v1 As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1438,12 +1438,12 @@ Private Sub IClass1_DoSomething(ByVal s As String, ByVal i As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; @@ -1451,7 +1451,7 @@ Private Sub IClass1_DoSomething(ByVal s As String, ByVal i As Integer) var module3 = project.Object.VBComponents.Item(2).CodeModule; //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1505,12 +1505,12 @@ Private Sub IClass1_DoSomething(ByVal b As String, ByVal a As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; @@ -1522,7 +1522,7 @@ Private Sub IClass1_DoSomething(ByVal b As String, ByVal a As Integer) .Returns(DialogResult.Yes); //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, messageBox.Object); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, messageBox.Object); model.Parameters.Reverse(); //SetupFactory @@ -1563,12 +1563,12 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String) var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1577,7 +1577,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String) .Returns(DialogResult.No); //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, messageBox.Object); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, messageBox.Object); Assert.IsNull(model.TargetDeclaration); } @@ -1618,19 +1618,19 @@ Private Sub abc_Foo(ByVal arg2 As String, ByVal arg1 As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1682,19 +1682,19 @@ Private Sub abc_Foo(ByVal s As String, ByVal i As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; var module2 = project.Object.VBComponents.Item(1).CodeModule; //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1758,12 +1758,12 @@ Private Sub abc_Foo(ByVal v2 As String, ByVal v1 As Integer) var codePaneFactory = new CodePaneWrapperFactory(); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var module1 = project.Object.VBComponents.Item(0).CodeModule; @@ -1771,7 +1771,7 @@ Private Sub abc_Foo(ByVal v2 As String, ByVal v1 As Integer) var module3 = project.Object.VBComponents.Item(2).CodeModule; //Specify Params to remove - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, null); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, null); model.Parameters.Reverse(); //SetupFactory @@ -1802,26 +1802,26 @@ public void Presenter_AcceptDialog_ReordersProcedureWithTwoParameters() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, new MessageBox()); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, new MessageBox()); model.Parameters.Reverse(); var view = new Mock(); view.Setup(v => v.ShowDialog()).Returns(DialogResult.OK); view.Setup(v => v.Parameters).Returns(model.Parameters); - var factory = new ReorderParametersPresenterFactory(editor.Object, view.Object, parseResult.State, null); + var factory = new ReorderParametersPresenterFactory(editor.Object, view.Object, parser.State, null); var presenter = factory.Create(); @@ -1843,25 +1843,25 @@ public void Presenter_CancelDialogCreatesNullModel() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var model = new ReorderParametersModel(parseResult.State, qualifiedSelection, new MessageBox()); + var model = new ReorderParametersModel(parser.State, qualifiedSelection, new MessageBox()); var view = new Mock(); view.Setup(v => v.ShowDialog()).Returns(DialogResult.Cancel); view.Setup(v => v.Parameters).Returns(model.Parameters); - var factory = new ReorderParametersPresenterFactory(editor.Object, view.Object, parseResult.State, null); + var factory = new ReorderParametersPresenterFactory(editor.Object, view.Object, parser.State, null); var presenter = factory.Create(); //Act @@ -1886,12 +1886,12 @@ public void Presenter_ParameterlessMemberCreatesNullModel() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1902,7 +1902,7 @@ public void Presenter_ParameterlessMemberCreatesNullModel() messageBox.Setup(m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(DialogResult.OK); - var factory = new ReorderParametersPresenterFactory(editor.Object, null, parseResult.State, messageBox.Object); + var factory = new ReorderParametersPresenterFactory(editor.Object, null, parser.State, messageBox.Object); var presenter = factory.Create(); //Act @@ -1927,12 +1927,12 @@ public void Presenter_SingleParameterMemberCreatesNullModel() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); @@ -1943,7 +1943,7 @@ public void Presenter_SingleParameterMemberCreatesNullModel() messageBox.Setup(m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(DialogResult.OK); - var factory = new ReorderParametersPresenterFactory(editor.Object, null, parseResult.State, messageBox.Object); + var factory = new ReorderParametersPresenterFactory(editor.Object, null, parser.State, messageBox.Object); var presenter = factory.Create(); //Act @@ -1969,19 +1969,19 @@ Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String) var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns(qualifiedSelection); - var factory = new ReorderParametersPresenterFactory(editor.Object, null, parseResult.State, null); + var factory = new ReorderParametersPresenterFactory(editor.Object, null, parser.State, null); var presenter = factory.Create(); @@ -2006,17 +2006,17 @@ public void Factory_NullSelectionCreatesNullPresenter() var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); var mockHost = new Mock(); mockHost.SetupAllProperties(); - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; var editor = new Mock(); editor.Setup(e => e.GetSelection()).Returns((QualifiedSelection?)null); - var factory = new ReorderParametersPresenterFactory(editor.Object, null, parseResult.State, null); + var factory = new ReorderParametersPresenterFactory(editor.Object, null, parser.State, null); //Act var result = factory.Create(); diff --git a/RubberduckTests/RubberduckParserTests.cs b/RubberduckTests/RubberduckParserTests.cs index 1a0992c0de..a1d48a453c 100644 --- a/RubberduckTests/RubberduckParserTests.cs +++ b/RubberduckTests/RubberduckParserTests.cs @@ -23,7 +23,7 @@ void State_StateChanged(object sender, ParserStateEventArgs e) } [TestMethod, Timeout(1000)] - public void ParseResultDeclarations_IncludeVbaStandardLibDeclarations() + public void parserDeclarations_IncludeVbaStandardLibDeclarations() { //Arrange var builder = new MockVbeBuilder(); @@ -50,7 +50,7 @@ public void ParseResultDeclarations_IncludeVbaStandardLibDeclarations() } [TestMethod, Timeout(1000)] - public void ParseResultDeclarations_MockHost_ExcludeExcelDeclarations() + public void parserDeclarations_MockHost_ExcludeExcelDeclarations() { //Arrange var builder = new MockVbeBuilder(); @@ -63,14 +63,14 @@ public void ParseResultDeclarations_MockHost_ExcludeExcelDeclarations() mockHost.SetupAllProperties(); //Act - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); //Assert - Assert.IsFalse(parseResult.State.AllDeclarations.Any(item => item.IsBuiltIn && item.ParentScope.StartsWith("Excel"))); + Assert.IsFalse(parser.State.AllDeclarations.Any(item => item.IsBuiltIn && item.ParentScope.StartsWith("Excel"))); } [TestMethod, Timeout(1000)] - public void ParseResultDeclarations_ExcelHost_IncludesExcelDeclarations() + public void parserDeclarations_ExcelHost_IncludesExcelDeclarations() { //Arrange var builder = new MockVbeBuilder(); @@ -81,15 +81,15 @@ public void ParseResultDeclarations_ExcelHost_IncludesExcelDeclarations() var vbe = builder.AddProject(project).Build(); //Act - var parseResult = new RubberduckParser(vbe.Object, new RubberduckParserState()); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); - parseResult.State.StateChanged += State_StateChanged; - parseResult.State.OnParseRequested(); + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); _semaphore.Wait(); - parseResult.State.StateChanged -= State_StateChanged; + parser.State.StateChanged -= State_StateChanged; //Assert - Assert.IsTrue(parseResult.State.AllDeclarations.Any(item => item.IsBuiltIn && item.ParentScope.StartsWith("Excel"))); + Assert.IsTrue(parser.State.AllDeclarations.Any(item => item.IsBuiltIn && item.ParentScope.StartsWith("Excel"))); } } } From eb218d2b23f0413bba581b7ad8f89b17d2022929 Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 12:44:24 -0600 Subject: [PATCH 2/7] Add timeout to test. --- RubberduckTests/Refactoring/PromoteLocalToParameter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs index 5bccff9692..7bd2cf3cb0 100644 --- a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs +++ b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs @@ -25,7 +25,7 @@ void State_StateChanged(object sender, ParserStateEventArgs e) } } - [TestMethod] + [TestMethod, Timeout(1000)] public void PromoteLocalToParameterRefactoring_NoParamsInList() { //Input From 58370f7525532e5261a798c4ea2a004aba453864 Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 12:54:08 -0600 Subject: [PATCH 3/7] Fix another bug. Add two tests. --- .../IntroduceParameterRefactoring.cs | 4 +- .../Refactoring/PromoteLocalToParameter.cs | 83 +++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs index af04179c1b..c11083e409 100644 --- a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs +++ b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs @@ -5,6 +5,7 @@ using Antlr4.Runtime.Misc; using Microsoft.Vbe.Interop; using Rubberduck.Common; +using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Symbols; using Rubberduck.Parsing.VBA; @@ -176,7 +177,8 @@ private void AddParameter(Declaration targetMethod, Declaration targetVariable, GetParameterDefinition(targetVariable) + ", " + argList.Last().GetText()); } - module.ReplaceLine(paramList.Start.Line, newContent); + module.ReplaceLine(paramList.Start.Line, newContent.Replace(" _" + Environment.NewLine, string.Empty)); + module.DeleteLines(paramList.Start.Line + 1, paramList.GetSelection().LineCount - 1); } private void UpdateProperties(Declaration target) diff --git a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs index 7bd2cf3cb0..18426c6cba 100644 --- a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs +++ b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs @@ -65,5 +65,88 @@ Dim bar As Boolean //Assert Assert.AreEqual(expectedCode, module.Lines()); } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_OneParamInList() + { + //Input + const string inputCode = +@"Private Sub Foo(ByVal buz As Integer) + Dim bar As Boolean +End Sub"; + var selection = new Selection(2, 10, 2, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal buz As Integer, ByVal bar As Boolean) +End Sub"; + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_MultipleParamsOnMultipleLines() + { + //Input + const string inputCode = +@"Private Sub Foo(ByVal buz As Integer, _ + ByRef baz As Date) + Dim bar As Boolean +End Sub"; + var selection = new Selection(3, 10, 3, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal buz As Integer, ByRef baz As Date, ByVal bar As Boolean) +End Sub"; + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } } } From 6677b2efb17a83ec15201e9096cbb40b6a0c9db0 Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 13:10:16 -0600 Subject: [PATCH 4/7] Use extension method to remove extra spaces, but save indentation space. --- .../IntroduceParameterRefactoring.cs | 2 +- Rubberduck.Parsing/VBA/StringExtensions.cs | 30 ++++++++++++ .../Refactoring/PromoteLocalToParameter.cs | 47 ++++++++++++++++++- 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs index c11083e409..e8b1719e9a 100644 --- a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs +++ b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs @@ -252,7 +252,7 @@ private void RemoveVariable(Declaration target) if (newLinesWithoutEmptyLines.Any()) { - _editor.InsertLines(selection.StartLine, string.Join(" _" + Environment.NewLine, newLinesWithoutEmptyLines)); + _editor.InsertLines(selection.StartLine, string.Join(string.Empty, newLinesWithoutEmptyLines).RemoveExtraSpacesLeavingIndentation()); } } diff --git a/Rubberduck.Parsing/VBA/StringExtensions.cs b/Rubberduck.Parsing/VBA/StringExtensions.cs index 8fbd7278b4..0062c1c5b6 100644 --- a/Rubberduck.Parsing/VBA/StringExtensions.cs +++ b/Rubberduck.Parsing/VBA/StringExtensions.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Text; using System.Text.RegularExpressions; using Rubberduck.Parsing.Grammar; @@ -50,6 +51,35 @@ public static string RemoveExtraSpaces(this string line) return newString.ToString().Replace('\r', ' '); } + public static string RemoveExtraSpacesLeavingIndentation(this string line) + { + var newString = new StringBuilder(); + var lastWasWhiteSpace = false; + + if (line.All(char.IsWhiteSpace)) + { + return line; + } + + var firstNonwhitespaceIndex = line.IndexOf(line.FirstOrDefault(c => !char.IsWhiteSpace(c))); + + for (var i = 0; i < line.Length; i++) + { + if (i < firstNonwhitespaceIndex) + { + newString.Append(line[i]); + continue; + } + + if (char.IsWhiteSpace(line[i]) && lastWasWhiteSpace) { continue; } + + newString.Append(line[i]); + lastWasWhiteSpace = char.IsWhiteSpace(line[i]); + } + + return newString.ToString().Replace('\r', ' '); + } + public static int NthIndexOf(this string line, char chr, int index) { var currentIndexOf = 0; diff --git a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs index 18426c6cba..0758d44704 100644 --- a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs +++ b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs @@ -116,12 +116,57 @@ public void PromoteLocalToParameterRefactoring_MultipleParamsOnMultipleLines() ByRef baz As Date) Dim bar As Boolean End Sub"; - var selection = new Selection(3, 10, 3, 13); //startLine, startCol, endLine, endCol + var selection = new Selection(3, 8, 3, 20); //startLine, startCol, endLine, endCol //Expectation const string expectedCode = @"Private Sub Foo(ByVal buz As Integer, ByRef baz As Date, ByVal bar As Boolean) +End Sub"; // note: the VBE removes extra spaces + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_MultipleVariablesInStatement_MoveFirst() + { + //Input + const string inputCode = +@"Private Sub Foo(ByVal buz As Integer, _ + ByRef baz As Date) + Dim bar As Boolean, _ + bat As Date, _ + bap As Integer End Sub"; + var selection = new Selection(3, 10, 3, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal buz As Integer, ByRef baz As Date, ByVal bar As Boolean) + Dim bat As Date, bap As Integer +End Sub"; // note: the VBE removes extra spaces //Arrange var builder = new MockVbeBuilder(); From a90e4987e7845c587fd95d92f3c06d2c63d4529f Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 13:14:27 -0600 Subject: [PATCH 5/7] Update everything to use new extension method. Broke a bunch of tests - will update later. --- .../MultilineParameterInspectionResult.cs | 2 +- .../Refactorings/RemoveParameters/Parameter.cs | 2 +- .../RemoveParametersRefactoring.cs | 2 +- .../ReorderParameters/ReorderParametersModel.cs | 2 +- .../ReorderParametersRefactoring.cs | 2 +- Rubberduck.Parsing/VBA/StringExtensions.cs | 16 ---------------- 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/RetailCoder.VBE/Inspections/MultilineParameterInspectionResult.cs b/RetailCoder.VBE/Inspections/MultilineParameterInspectionResult.cs index 0ab307fea8..3546f42c3e 100644 --- a/RetailCoder.VBE/Inspections/MultilineParameterInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/MultilineParameterInspectionResult.cs @@ -47,7 +47,7 @@ public override void Fix() var parameter = lines.Substring(adjustedStartColumn, adjustedEndColumn - adjustedStartColumn) .Replace("_", "") - .RemoveExtraSpaces(); + .RemoveExtraSpacesLeavingIndentation(); var start = startLine.Remove(adjustedStartColumn); var end = lines.Remove(0, adjustedEndColumn); diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/Parameter.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/Parameter.cs index 44b0ff6b6c..e49668364a 100644 --- a/RetailCoder.VBE/Refactorings/RemoveParameters/Parameter.cs +++ b/RetailCoder.VBE/Refactorings/RemoveParameters/Parameter.cs @@ -17,7 +17,7 @@ public class Parameter public Parameter(Declaration declaration, int index, bool isRemoved = false) { Declaration = declaration; - Name = declaration.Context.GetText().RemoveExtraSpaces(); + Name = declaration.Context.GetText().RemoveExtraSpacesLeavingIndentation(); Index = index; IsRemoved = isRemoved; } diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs index 67db6c616f..f214bf1f14 100644 --- a/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs +++ b/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs @@ -101,7 +101,7 @@ private void RemoveCallParameter(VBAParser.ArgsCallContext paramList, CodeModule var paramNames = paramList.argCall().Select(arg => arg.GetText()).ToList(); var lineCount = paramList.Stop.Line - paramList.Start.Line + 1; // adjust for total line count - var newContent = module.Lines[paramList.Start.Line, lineCount].Replace(" _" + Environment.NewLine, string.Empty).RemoveExtraSpaces(); + var newContent = module.Lines[paramList.Start.Line, lineCount].Replace(" _" + Environment.NewLine, string.Empty).RemoveExtraSpacesLeavingIndentation(); var currentStringIndex = 0; foreach ( diff --git a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersModel.cs b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersModel.cs index c586bd01d5..fddee0331d 100644 --- a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersModel.cs +++ b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersModel.cs @@ -53,7 +53,7 @@ private void LoadParameters() var args = argList.arg(); var index = 0; - Parameters = args.Select(arg => new Parameter(arg.GetText().RemoveExtraSpaces(), index++)).ToList(); + Parameters = args.Select(arg => new Parameter(arg.GetText().RemoveExtraSpacesLeavingIndentation(), index++)).ToList(); if (TargetDeclaration.DeclarationType == DeclarationType.PropertyLet || TargetDeclaration.DeclarationType == DeclarationType.PropertySet) diff --git a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs index 705b7c5e79..52d0a63f14 100644 --- a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs +++ b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs @@ -114,7 +114,7 @@ private void RewriteCall(VBAParser.ArgsCallContext paramList, CodeModule module) var paramNames = paramList.argCall().Select(arg => arg.GetText()).ToList(); var lineCount = paramList.Stop.Line - paramList.Start.Line + 1; // adjust for total line count - var newContent = module.Lines[paramList.Start.Line, lineCount].Replace(" _" + Environment.NewLine, string.Empty).RemoveExtraSpaces(); + var newContent = module.Lines[paramList.Start.Line, lineCount].Replace(" _" + Environment.NewLine, string.Empty).RemoveExtraSpacesLeavingIndentation(); var parameterIndex = 0; var currentStringIndex = 0; diff --git a/Rubberduck.Parsing/VBA/StringExtensions.cs b/Rubberduck.Parsing/VBA/StringExtensions.cs index 0062c1c5b6..55222d062a 100644 --- a/Rubberduck.Parsing/VBA/StringExtensions.cs +++ b/Rubberduck.Parsing/VBA/StringExtensions.cs @@ -35,22 +35,6 @@ public static string StripStringLiterals(this string line) return Regex.Replace(line, "\"[^\"]*\"", match => new string(' ', match.Length)); } - public static string RemoveExtraSpaces(this string line) - { - var newString = new StringBuilder(); - var lastWasWhiteSpace = false; - - foreach (var c in line) - { - if (char.IsWhiteSpace(c) && lastWasWhiteSpace) { continue; } - - newString.Append(c); - lastWasWhiteSpace = char.IsWhiteSpace(c); - } - - return newString.ToString().Replace('\r', ' '); - } - public static string RemoveExtraSpacesLeavingIndentation(this string line) { var newString = new StringBuilder(); From ccffd102f9d2f84ce49c1ab4d142dcf9402bc998 Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 15:33:28 -0600 Subject: [PATCH 6/7] Fix tests failing due to code upgrade. Add a couple more. --- .../Refactoring/PromoteLocalToParameter.cs | 90 +++++++++++++++++++ .../Refactoring/RemoveParametersTests.cs | 14 +-- .../Refactoring/ReorderParametersTests.cs | 14 +-- 3 files changed, 104 insertions(+), 14 deletions(-) diff --git a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs index 0758d44704..c693bab4ef 100644 --- a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs +++ b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs @@ -193,5 +193,95 @@ bap As Integer //Assert Assert.AreEqual(expectedCode, module.Lines()); } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_MultipleVariablesInStatement_MoveSecond() + { + //Input + const string inputCode = +@"Private Sub Foo(ByVal buz As Integer, _ + ByRef baz As Date) + Dim bar As Boolean, _ + bat As Date, _ + bap As Integer +End Sub"; + var selection = new Selection(4, 10, 4, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal buz As Integer, ByRef baz As Date, ByVal bat As Date) + Dim bar As Boolean, bap As Integer +End Sub"; // note: the VBE removes extra spaces + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_MultipleVariablesInStatement_MoveLast() + { + //Input + const string inputCode = +@"Private Sub Foo(ByVal buz As Integer, _ + ByRef baz As Date) + Dim bar As Boolean, _ + bat As Date, _ + bap As Integer +End Sub"; + var selection = new Selection(5, 10, 5, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal buz As Integer, ByRef baz As Date, ByVal bap As Integer) + Dim bar As Boolean, bat As Date +End Sub"; // note: the VBE removes extra spaces + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } } } diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs index f8045880f8..f215529147 100644 --- a/RubberduckTests/Refactoring/RemoveParametersTests.cs +++ b/RubberduckTests/Refactoring/RemoveParametersTests.cs @@ -236,7 +236,7 @@ End Sub End Sub Public Sub Goo() - Foo arg2:=""test44"", arg1:=3 + Foo arg2:=""test44"", arg1:=3 End Sub "; //note: The IDE strips out the extra whitespace @@ -384,7 +384,7 @@ End Sub End Function Private Sub Goo(ByVal arg1 As Integer, ByVal arg2 As String) - Foo + Foo End Sub "; //note: The IDE strips out the extra whitespace @@ -577,7 +577,7 @@ End Sub End Sub Private Sub Bar() - Foo ""Hello"" + Foo ""Hello"" End Sub "; //note: The IDE strips out the extra whitespace @@ -633,7 +633,7 @@ End Sub End Sub Private Sub Bar() - Foo 10 + Foo 10 End Sub "; //note: The IDE strips out the extra whitespace, you can't see it but there's a space after "Foo 10 " @@ -701,7 +701,7 @@ Public Sub Goo(ByVal arg1 As Integer, _ ByVal arg5 As Integer, _ ByVal arg6 As Integer) - Foo ""test"" + Foo ""test"" End Sub "; //note: The IDE strips out the extra whitespace, you can't see it but there are several spaces after " ParamArrayTest ""test"" " @@ -922,7 +922,7 @@ Foo arg1 End Sub Private Sub Goo(ByVal arg1 As Integer) - Foo + Foo End Sub"; //Arrange @@ -1174,7 +1174,7 @@ End Sub Private Sub Goo(ByVal arg1 as Integer, ByVal arg2 As String, ByVal arg3 As Date) - Foo arg2, arg3 + Foo arg2, arg3 End Sub "; // note: IDE removes excess spaces diff --git a/RubberduckTests/Refactoring/ReorderParametersTests.cs b/RubberduckTests/Refactoring/ReorderParametersTests.cs index c8b861c0ed..429dad1a44 100644 --- a/RubberduckTests/Refactoring/ReorderParametersTests.cs +++ b/RubberduckTests/Refactoring/ReorderParametersTests.cs @@ -247,7 +247,7 @@ End Sub End Sub Private Sub Bar() - Foo ""Hello"", 10 + Foo ""Hello"", 10 End Sub "; @@ -303,7 +303,7 @@ End Sub End Sub Public Sub Goo() - Foo arg2:=""test44"", arg1:=3, arg3:=6.1 + Foo arg2:=""test44"", arg1:=3, arg3:=6.1 End Sub "; @@ -416,7 +416,7 @@ End Sub End Sub Public Sub Goo() - Foo arg1:=3, arg2:=""test44"" + Foo arg1:=3, arg2:=""test44"" End Sub "; @@ -742,7 +742,7 @@ End Sub Private Sub Goo(ByVal arg1 as Integer, ByVal arg2 As String, ByVal arg3 As Date) - Foo arg3, arg2, arg1 + Foo arg3, arg2, arg1 End Sub "; @@ -870,7 +870,7 @@ Public Sub Goo(ByVal arg As Date, _ ByVal arg5 As Integer, _ ByVal arg6 As Integer) - Foo arg, ""test"", test1x, test2x, test3x, test4x, test5x, test6x + Foo arg, ""test"", test1x, test2x, test3x, test4x, test5x, test6x End Sub "; @@ -958,7 +958,7 @@ Public Sub Goo(ByVal arg As Date, _ ByVal arg5 As Integer, _ ByVal arg6 As Integer) - Foo arg, ""test"", test1x, test2x, test3x, test4x, test5x, test6x + Foo arg, ""test"", test1x, test2x, test3x, test4x, test5x, test6x End Sub "; @@ -1076,7 +1076,7 @@ End Sub End Sub Private Sub Goo(ByVal arg1 As Integer, ByVal arg2 As String) - Foo arg2, arg1 + Foo arg2, arg1 End Sub "; From 132290cfc8badffe4e9a2791cb4b3f22b8984180 Mon Sep 17 00:00:00 2001 From: hosch250 Date: Sat, 30 Jan 2016 16:05:01 -0600 Subject: [PATCH 7/7] More tests! --- .../IntroduceParameterRefactoring.cs | 20 ++- .../Refactoring/PromoteLocalToParameter.cs | 133 ++++++++++++++++++ 2 files changed, 146 insertions(+), 7 deletions(-) diff --git a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs index e8b1719e9a..53b8b495e0 100644 --- a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs +++ b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs @@ -56,13 +56,22 @@ public void Refactor(QualifiedSelection selection) { var target = _declarations.FindVariable(selection); + if (target == null) + { + _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, + MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + return; + } + PromoteVariable(target); } public void Refactor(Declaration target) { - if (target.DeclarationType != DeclarationType.Variable) + if (target == null || target.DeclarationType != DeclarationType.Variable) { + _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, + MessageBoxButtons.OK, MessageBoxIcon.Exclamation); throw new ArgumentException("Invalid declaration type"); } @@ -76,8 +85,10 @@ private void PromoteVariable(Declaration target) return; } - if (IsContainedInClassOrModule(target)) + if (new[] { DeclarationType.Class, DeclarationType.Module }.Contains(target.ParentDeclaration.DeclarationType)) { + _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, + MessageBoxButtons.OK, MessageBoxIcon.Exclamation); return; } @@ -85,11 +96,6 @@ private void PromoteVariable(Declaration target) UpdateSignature(target); } - private bool IsContainedInClassOrModule(Declaration target) - { - return target.ParentDeclaration != null && IsContainedInClassOrModule(target.ParentDeclaration); - } - private bool PromptIfMethodImplementsInterface(Declaration targetVariable) { var functionDeclaration = _declarations.FindTarget(targetVariable.QualifiedSelection, ValidDeclarationTypes); diff --git a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs index c693bab4ef..832cf6aa6e 100644 --- a/RubberduckTests/Refactoring/PromoteLocalToParameter.cs +++ b/RubberduckTests/Refactoring/PromoteLocalToParameter.cs @@ -1,9 +1,11 @@ using System.Threading; +using System.Windows.Forms; using Microsoft.Vbe.Interop; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using Rubberduck.Parsing.VBA; using Rubberduck.Refactorings.IntroduceParameter; +using Rubberduck.UI; using Rubberduck.VBEditor; using Rubberduck.VBEditor.Extensions; using Rubberduck.VBEditor.VBEHost; @@ -283,5 +285,136 @@ bap As Integer //Assert Assert.AreEqual(expectedCode, module.Lines()); } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_MultipleVariablesInStatement_OnOneLine_MoveFirst() + { + //Input + const string inputCode = +@"Private Sub Foo(ByVal buz As Integer, _ + ByRef baz As Date) + Dim bar As Boolean, bat As Date, bap As Integer +End Sub"; + var selection = new Selection(3, 10, 3, 13); //startLine, startCol, endLine, endCol + + //Expectation + const string expectedCode = +@"Private Sub Foo(ByVal buz As Integer, ByRef baz As Date, ByVal bar As Boolean) + Dim bat As Date, bap As Integer +End Sub"; // note: the VBE removes extra spaces + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), null); + refactoring.Refactor(qualifiedSelection); + + //Assert + Assert.AreEqual(expectedCode, module.Lines()); + } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_DisplaysInvalidSelectionAndDoesNothingForField() + { + //Input + const string inputCode = +@"Private fizz As Boolean + +Private Sub Foo() +End Sub"; + var selection = new Selection(1, 14, 1, 14); //startLine, startCol, endLine, endCol + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + var messageBox = new Mock(); + messageBox.Setup(m => + m.Show(It.IsAny(), It.IsAny(), It.IsAny(), + It.IsAny())).Returns(DialogResult.OK); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), messageBox.Object); + refactoring.Refactor(qualifiedSelection); + + //Assert + messageBox.Verify(m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), + It.IsAny()), Times.Once); + Assert.AreEqual(inputCode, module.Lines()); + } + + [TestMethod, Timeout(1000)] + public void PromoteLocalToParameterRefactoring_DisplaysInvalidSelectionAndDoesNothingForInvalidSelection() + { + //Input + const string inputCode = +@"Private fizz As Boolean + +Private Sub Foo() +End Sub"; + var selection = new Selection(3, 16, 3, 16); //startLine, startCol, endLine, endCol + + //Arrange + var builder = new MockVbeBuilder(); + VBComponent component; + var vbe = builder.BuildFromSingleStandardModule(inputCode, out component); + var project = vbe.Object.VBProjects.Item(0); + var module = project.VBComponents.Item(0).CodeModule; + var codePaneFactory = new CodePaneWrapperFactory(); + var mockHost = new Mock(); + mockHost.SetupAllProperties(); + var parser = new RubberduckParser(vbe.Object, new RubberduckParserState()); + + parser.State.StateChanged += State_StateChanged; + parser.State.OnParseRequested(); + _semaphore.Wait(); + parser.State.StateChanged -= State_StateChanged; + + var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection); + + var messageBox = new Mock(); + messageBox.Setup(m => + m.Show(It.IsAny(), It.IsAny(), It.IsAny(), + It.IsAny())).Returns(DialogResult.OK); + + //Act + var refactoring = new IntroduceParameter(parser.State, new ActiveCodePaneEditor(vbe.Object, codePaneFactory), messageBox.Object); + refactoring.Refactor(qualifiedSelection); + + //Assert + messageBox.Verify(m => m.Show(It.IsAny(), It.IsAny(), It.IsAny(), + It.IsAny()), Times.Once); + Assert.AreEqual(inputCode, module.Lines()); + } } }