Removed GIT conflict markers and commented-out code

Author: BZngr

RubberduckTests/Inspections/AssignedByValParameterMakeLocalCopyQuickFixTests.cs

@@ -226,183 +226,5 @@ private string GetModuleContent(IVBE vbe, string componentName = "")
                 ? project.VBComponents[componentName].CodeModule : project.VBComponents[0].CodeModule;
             return module.Content();
         }
-/*//<<<<<<< HEAD
-//=======
-
-        internal class TestComponentSpecification
-        {
-            private string _name;
-            private string _content;
-            private ComponentType _componentType;
-            public TestComponentSpecification(string componentName, string componentContent, ComponentType componentType)
-            {
-                _name = componentName;
-                _content = componentContent;
-                _componentType = componentType;
-            }
-
-            public string Name { get { return _name; } }
-            public string Content { get { return _content; } }
-            public ComponentType ModuleType { get { return _componentType; } }
-        }
-
-        private string GetQuickFixResult(string userEnteredNames, TestComponentSpecification resultsComponent, TestComponentSpecification[] testComponents)
-        {
-            var vbe = BuildProject("TestProject", testComponents.ToList());
-            var state = MockParser.CreateAndParse(vbe.Object);
-
-            var mockDialogFactory = BuildMockDialogFactory(userEnteredNames);
-            var inspection = new AssignedByValParameterInspection(state, mockDialogFactory.Object);
-            var inspectionResults = inspection.GetInspectionResults();
-
-            inspectionResults.First().QuickFixes.Single(s => s is AssignedByValParameterMakeLocalCopyQuickFix).Fix();
-
-            return GetModuleContent(vbe.Object, resultsComponent.Name);
-        }
-
-        private Mock<IVBE> BuildProject(string projectName, List<TestComponentSpecification> testComponents)
-        {
-            var builder = new MockVbeBuilder();
-            var enclosingProjectBuilder = builder.ProjectBuilder(projectName, ProjectProtection.Unprotected);
-
-            testComponents.ForEach(c => enclosingProjectBuilder.AddComponent(c.Name, c.ModuleType, c.Content));
-            var enclosingProject = enclosingProjectBuilder.Build();
-            builder.AddProject(enclosingProject);
-            return builder.Build();
-        }
-
-        private string GetNameAlreadyAccessibleWithinClass_FirstClassBody()
-        {
-            return
-                @"
-Private memberString As String
-Private memberLong As Long
-
-Private Sub Class_Initialize()
-    memberLong = 6
-    memberString = ""No Value""
-End Sub
-
-Public Sub Foo(ByVal arg1 As String, theSecondArg As Long)
-    Let arg1 = ""test""
-End Sub
-
-Private Sub FooFight(ByRef arg1 As String)
-    xArg1 = 6
-    Let arg1 = ""test""
-End Sub
-";
-
-        }
-        private string GetRespectsDeclarationsAccessibilityRules_FirstClassBody()
-        {
-            return
-@"
-Private memberString As String
-Private memberLong As Long
-Private myEggo as String
-
-Public Sub Foo(ByVal arg1 As String)
-    Dim localVar as Long
-    localVar = 7
-    Let arg1 = ""test""
-    memberString = arg1 & ""Foo""
-End Sub
-
-Public Function KungFooFighting(ByRef arg1 As String, theSecondArg As Long) As String
-    Let arg1 = ""test""
-    Dim result As String
-    result = arg1 & theSecondArg
-    KungFooFighting = result
-End Function
-
-Property Let GoMyEggo(newValue As String)
-    myEggo = newValue
-End Property
-
-Property Get GoMyEggo()
-    GoMyEggo = myEggo
-End Property
-
-Private Sub FooFight(ByRef arg1 As String)
-    xArg1 = 6
-    Let arg1 = ""test""
-End Sub
-";
-        }
-        private string GetRespectsDeclarationsAccessibilityRules_SecondClassBody()
-        {
-            return
-@"
-Private memberString As String
-Private memberLong As Long
-Public mySecondEggo as String
-
-
-Public Sub Foo2( arg1 As String, theSecondArg As Long)
-    Let arg1 = ""test""
-    memberString = arg1 & ""Foo""
-End Sub
-
-Public Function KungFooFighting(ByRef arg1 As String, theSecondArg As Long) As String
-    Let arg1 = ""test""
-    Dim result As String
-    result = arg1 & theSecondArg
-    KungFooFighting = result
-End Function
-
-Property Let GoMyOtherEggo(newValue As String)
-    mySecondEggo = newValue
-End Property
-
-Property Get GoMyOtherEggo()
-    GoMyOtherEggo = mySecondEggo
-End Property
-
-Private Sub FooFighters(ByRef arg1 As String)
-    xArg1 = 6
-    Let arg1 = ""test""
-End Sub
-
-Sub Bar()
-    Dim st As String
-    st = ""Test""
-    Dim v As Long
-    v = 5
-    result = KungFooFighting(st, v)
-End Sub
-";
-        }
-        private string GetRespectsDeclarationsAccessibilityRules_FirstModuleBody()
-        {
-            return
-@"
-Option Explicit
-
-
-Public Const CantTouchThis As String = ""Can't Touch this""
-Public THE_FILENAME As String
-
-Sub SetFilename(filename As String)
-    THE_FILENAME = filename
-End Sub
-";
-        }
-        private string GetRespectsDeclarationsAccessibilityRules_SecondModuleBody()
-        {
-            return
-@"
-Option Explicit
-
-
-Public BigNumber as Long
-Public ShortStory As String
-
-Public Sub DoSomething(filename As String)
-    ShortStory = filename
-End Sub
-";
-        }
-//>>>>>>> rubberduck-vba/next*/
     }
 }

RubberduckTests/Refactoring/RenameTests.cs

@@ -16,52 +16,6 @@ namespace RubberduckTests.Refactoring
     [TestClass]
     public class RenameTests
     {
-/*<<<<<<< HEAD
-=======
-        [TestMethod]
-        public void RenameRefactoring_RenameSub_Issue2727()
-        {
-            //Input
-            string inputCode = GetIssue2727ExampleCode();
-
-            Selection selection = Select2727Variable();
-
-            //New name provided by the user - no conflicts
-            var userEnteredName = "Value";
-
-            //Expectation
-            //Expecation is that the messageBox.Show() is not invoked
-
-            IVBComponent component;
-            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
-            var state = MockParser.CreateAndParse(vbe.Object);
-
-            var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
-
-            var msgbox = new Mock<IMessageBox>();
-            msgbox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()))
-                  .Returns(DialogResult.Yes);
-
-            var vbeWrapper = vbe.Object;
-            var model = new RenameModel(vbeWrapper, state, qualifiedSelection, msgbox.Object) { NewName = userEnteredName };
-
-            //SetupFactory
-            var factory = SetupFactory(model);
-
-            var refactoring = new RenameRefactoring(vbeWrapper, factory.Object, msgbox.Object, state);
-            refactoring.Refactor(qualifiedSelection);
-
-            //#2727 bug describes a scenario where a declaration collision is detected where none exists.
-            //The result of detecting one or more collisions is that the messagebox is presented to the user
-            //To see if he wants to continue with the Renaming process.
-            //To pass this test, FindDeclarationForIdentifier() should find zero collisions and therefore
-            //skips the logic that presents the message box to the user. 
-            string failMsg = "RenameRefactoring found a conflicting declaration where none exists.";
-            msgbox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()), Times.Never, failMsg);
-        }
-
->>>>>>> rubberduck-vba/next */
-
         [TestMethod]
         public void RenameRefactoring_RenameSub()
         {

RubberduckTests/Symbols/DeclarationFinderTests.cs

@@ -1,37 +1,23 @@
-/*<<<<<<< HEAD
-=======*/
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Antlr4.Runtime;
-//>>>>>>> rubberduck-vba/next
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-//<<<<<<< HEAD
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
 using Antlr4.Runtime;
 using Rubberduck.Inspections;
-/*=======
-using Rubberduck.VBEditor;
-using Rubberduck.VBEditor.SafeComWrappers;
-using RubberduckTests.Mocks;
->>>>>>> rubberduck-vba/next */
 
 namespace RubberduckTests.Symbols
 {
     [TestClass]
     public class DeclarationFinderTests
     {
-//<<<<<<< HEAD
         private AccessibilityTestsDataObject _tdo;
 
         [TestMethod]
@@ -359,7 +345,7 @@ End Sub
 ";
         }
         #endregion
-//=======
+
         [TestMethod]
         [Ignore] // ref. https://github.com/rubberduck-vba/Rubberduck/issues/2330
         public void FiendishlyAmbiguousNameSelectsSmallestScopedDeclaration()
@@ -415,7 +401,6 @@ End Sub
 
             Assert.AreEqual(expected, actual, "Expected {0}, resolved to {1}", expected.DeclarationType, actual.DeclarationType);
         }
-//>>>>>>> rubberduck-vba/next
 
         [TestCategory("Resolver")]
         [TestMethod]