Pull and fix merge conflict

Author: Hosch250

RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs

@@ -251,7 +251,7 @@ private void RenameDeclaration()
             else
             {
                 var members = _declarations[_view.Target.IdentifierName]
-                    .Where(item => item.Project == _view.Target.Project
+                    .Where(item => item.Project == _view.Target.Project 
                         && item.ComponentName == _view.Target.ComponentName
                         && item.DeclarationType.HasFlag(DeclarationType.Property));
 
@@ -372,13 +372,8 @@ private void RenameUsages(Declaration target, string interfaceName = null)
 
         private string GetReplacementLine(string content, string newName, Selection selection)
         {
-            // until we figure out how to replace actual tokens,
-            // this is going to have to be done the ugly way...
-
-            // todo: come back after the identifier references are fixed
             var contentWithoutOldName = content.Remove(selection.StartColumn - 1, selection.EndColumn - selection.StartColumn);
             return contentWithoutOldName.Insert(selection.StartColumn - 1, newName);
-            //return Regex.Replace(content, "\\b" + target + "\\b", newName);
         }
 
         private string GetReplacementLine(CodeModule module, Declaration target, string newName)
@@ -412,8 +407,8 @@ private string GetReplacementLine(CodeModule module, Declaration target, string
                 var functionStmtContext = context as VBAParser.FunctionStmtContext;
                 if (functionStmtContext != null)
                 {
-                    lastTokenIndex = functionStmtContext.asTypeClause() != null
-                        ? functionStmtContext.asTypeClause().Stop.TokenIndex
+                    lastTokenIndex = functionStmtContext.asTypeClause() != null 
+                        ? functionStmtContext.asTypeClause().Stop.TokenIndex 
                         : functionStmtContext.argList().RPAREN().Symbol.TokenIndex;
                 }
 
@@ -475,7 +470,7 @@ private void AcquireTarget(out Declaration target, QualifiedSelection selection)
         {
             target = _declarations.Items
                 .Where(item => !item.IsBuiltIn && item.DeclarationType != DeclarationType.ModuleOption)
-                .FirstOrDefault(item => IsSelectedDeclaration(selection, item)
+                .FirstOrDefault(item => IsSelectedDeclaration(selection, item) 
                                       || IsSelectedReference(selection, item));
 
             PromptIfTargetImplementsInterface(ref target);

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -66,7 +66,6 @@
     <Compile Include="Grammar\VBAVisitor.cs" />
     <Compile Include="IParseResultProvider.cs" />
     <Compile Include="IRubberduckParser.cs" />
-    <Compile Include="Symbols\InterfaceImplementationListener.cs" />
     <Compile Include="Symbols\ExceptionErrorListener.cs" />
     <Compile Include="Symbols\IdentifierReferenceResolver.cs" />
     <Compile Include="Symbols\SyntaxErrorException.cs" />

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;

Rubberduck.Parsing/Symbols/InterfaceImplementationListener.cs

@@ -45,23 +45,6 @@ private void OnProgress(VBComponentParseResult result)
 
         public void Resolve()
         {
-            // make a first pass to identify all interface implementations - resolver needs this to disembiguate members.
-            //foreach (var componentParseResult in _parseResults)
-            //{
-            //    try
-            //    {
-            //        var resolver = new IdentifierReferenceResolver(componentParseResult.QualifiedName, _declarations);
-            //        var listener = new InterfaceImplementationListener(resolver);
-            //        var walker = new ParseTreeWalker();
-            //        walker.Walk(listener, componentParseResult.ParseTree);
-            //    }
-            //    catch (WalkerCancelledException)
-            //    {
-            //        // exception is purposely thrown when walker exits the module's declarations section.
-            //    }
-            //}
-
-            // second pass; resolve all identifier usages
             foreach (var componentParseResult in _parseResults)
             {
                 OnProgress(componentParseResult);