removed Git conflict markers

Author: BZngr

RetailCoder.VBE/Inspections/QuickFixes/AssignedByValParameterMakeLocalCopyQuickFix.cs

@@ -18,27 +18,18 @@ public class AssignedByValParameterMakeLocalCopyQuickFix : QuickFixBase
     {
         private readonly Declaration _target;
         private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;
-//<<<<<<< HEAD
         private readonly RubberduckParserState _parserState;
-//        private string[] _variableNamesAccessibleToProcedureContext;
-//=======
         private readonly IEnumerable<string> _forbiddenNames;
-//>>>>>>> rubberduck-vba/next
         private string _localCopyVariableName;
 
         public AssignedByValParameterMakeLocalCopyQuickFix(Declaration target, QualifiedSelection selection, RubberduckParserState parserState, IAssignedByValParameterQuickFixDialogFactory dialogFactory)
             : base(target.Context, selection, InspectionsUI.AssignedByValParameterMakeLocalCopyQuickFix)
         {
             _target = target;
             _dialogFactory = dialogFactory;
-//<<<<<<< HEAD
             _parserState = parserState;
-            //_variableNamesAccessibleToProcedureContext = GetUserDefinedNamesAccessibleToProcedureContext(_target.Context.Parent.Parent);
-            //SetValidLocalCopyVariableNameSuggestion();
-//=======
             _forbiddenNames = GetIdentifierNamesAccessibleToProcedureContext(target.Context.Parent.Parent);
            _localCopyVariableName = ComputeSuggestedName();
-//>>>>>>> rubberduck-vba/next
         }
 
         public override bool CanFixInModule { get { return false; } }
@@ -108,16 +99,12 @@ private void ReplaceAssignedByValParameterReferences()
 
         private void InsertLocalVariableDeclarationAndAssignment()
         {
-//<<<<<<< HEAD
-            //var blocks = QuickFixHelper.GetBlockStmtContexts(_target.Context.Parent.Parent);
-//=======
             var block = QuickFixHelper.GetBlockStmtContexts(_target.Context.Parent.Parent).FirstOrDefault();
             if (block == null)
             {
                 return;
             }
 
-//>>>>>>> rubberduck-vba/next
             string[] lines = { BuildLocalCopyDeclaration(), BuildLocalCopyAssignment() };
             var module = Selection.QualifiedName.Component.CodeModule;
             module.InsertLines(block.Start.Line, lines);
@@ -134,11 +121,7 @@ private string BuildLocalCopyAssignment()
                 + _localCopyVariableName + " = " + _target.IdentifierName;
         }
 
-//<<<<<<< HEAD
-//        private string[] GetUserDefinedNamesAccessibleToProcedureContext(RuleContext ruleContext)
-//=======
         private IEnumerable<string> GetIdentifierNamesAccessibleToProcedureContext(RuleContext ruleContext)
-//>>>>>>> rubberduck-vba/next
         {
             var allIdentifiers = new HashSet<string>();
 
@@ -180,7 +163,6 @@ private IEnumerable<string> GetIdentifierNamesAccessibleToProcedureContext(RuleC
             return allIdentifiers.ToArray();
         }
 
-//<<<<<<< HEAD
         private HashSet<string> GetVariableNamesFromRuleContexts(RuleContext[] ruleContexts)
         {
             var tokenValues = typeof(Tokens).GetFields().Select(item => item.GetValue(null)).Cast<string>().Select(item => item);
@@ -203,50 +185,26 @@ private HashSet<RuleContext> GetIdentifierContexts(IReadOnlyList<RuleContext> ru
             foreach (RuleContext ruleContext in ruleContexts)
             {
                 var identifiersForThisContext = GetIdentifierContexts(ruleContext);
-//=======
-//        private IEnumerable<string> GetIdentifierNames(IEnumerable<RuleContext> ruleContexts)
-//        {
-//            var identifiers = new HashSet<string>();
-//            foreach (var identifiersForThisContext in ruleContexts.Select(GetIdentifierNames))
-//            {
-//>>>>>>> rubberduck-vba/next
                 identifiers.UnionWith(identifiersForThisContext);
             }
             return identifiers;
         }
 
-//<<<<<<< HEAD
         private HashSet<RuleContext> GetIdentifierContexts(RuleContext ruleContext)
-//=======
-//        private static HashSet<string> GetIdentifierNames(RuleContext ruleContext)
-//>>>>>>> rubberduck-vba/next
         {
             // note: this looks like something that's already handled somewhere else...
 
             //Recursively work through the tree to get all IdentifierContexts
-//<<<<<<< HEAD
             var results = new HashSet<RuleContext>();
-//=======
- //           var results = new HashSet<string>();
-//            var tokenValues = typeof(Tokens).GetFields().Select(item => item.GetValue(null)).Cast<string>().Select(item => item).ToArray();
-//>>>>>>> rubberduck-vba/next
             var children = GetChildren(ruleContext);
 
             foreach (var child in children)
             {
                 var context = child as VBAParser.IdentifierContext;
                 if (context != null)
                 {
-//<<<<<<< HEAD
-                    var childName = Identifier.GetName((VBAParser.IdentifierContext)child);
+                    //var childName = Identifier.GetName((VBAParser.IdentifierContext)child);
                     results.Add((RuleContext)child);
-//=======
- //                   var childName = Identifier.GetName(context);
-//                    if (!tokenValues.Contains(childName))
-//                    {
-//                        results.Add(childName);
-//                    }
-//>>>>>>> rubberduck-vba/next
                 }
                 else
                 {

RetailCoder.VBE/Inspections/Results/AssignedByValParameterInspectionResult.cs

@@ -12,12 +12,8 @@ namespace Rubberduck.Inspections.Results
     public class AssignedByValParameterInspectionResult : InspectionResultBase
     {
         private IEnumerable<QuickFixBase> _quickFixes;
-//<<<<<<< HEAD
         private RubberduckParserState _parserState;
         private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;
-//=======
-//        private readonly IAssignedByValParameterQuickFixDialogFactory _dialogFactory;
-//>>>>>>> rubberduck-vba/next
 
         public AssignedByValParameterInspectionResult(IInspection inspection, Declaration target, RubberduckParserState parserState, IAssignedByValParameterQuickFixDialogFactory dialogFactory) 
             : base(inspection, target)