Fix regex rename

Author: Hosch250

RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs

@@ -148,23 +148,7 @@ private void OnOkButtonClicked(object sender, EventArgs e)
 
             // must rename usages first; if target is a module or a project,
             // then renaming the declaration first would invalidate the parse results.
-
-            if (_view.Target.DeclarationType.HasFlag(DeclarationType.Property))
-            {
-                // properties can have more than 1 member.
-                var members = _declarations[_view.Target.IdentifierName]
-                    .Where(item => item.Project == _view.Target.Project
-                        && item.ComponentName == _view.Target.ComponentName
-                        && item.DeclarationType.HasFlag(DeclarationType.Property));
-                foreach (var member in members)
-                {
-                    RenameUsages(member);
-                }
-            }
-            else
-            {
-                RenameUsages(_view.Target);
-            }
+            RenameUsages(_view.Target);
 
             if (ModuleDeclarationTypes.Contains(_view.Target.DeclarationType))
             {
@@ -244,22 +228,9 @@ private void RenameDeclaration()
                 module.ReplaceLine(argList.Start.Line, newContent);
                 module.DeleteLines(argList.Start.Line + 1, lineNum - 1);
             }
-            else if (!_view.Target.DeclarationType.HasFlag(DeclarationType.Property))
-            {
-                module.ReplaceLine(_view.Target.Selection.StartLine, newContent);
-            }
             else
             {
-                var members = _declarations[_view.Target.IdentifierName]
-                    .Where(item => item.Project == _view.Target.Project 
-                        && item.ComponentName == _view.Target.ComponentName
-                        && item.DeclarationType.HasFlag(DeclarationType.Property));
-
-                foreach (var member in members)
-                {
-                    newContent = GetReplacementLine(module, member, _view.NewName);
-                    module.ReplaceLine(member.Selection.StartLine, newContent);
-                }
+                module.ReplaceLine(_view.Target.Selection.StartLine, newContent);
             }
         }
 
@@ -268,7 +239,7 @@ private void RenameControl()
             try
             {
                 var form = _view.Target.QualifiedName.QualifiedModuleName.Component.CodeModule;
-                var control = ((dynamic) form.Parent.Designer).Controls(_view.Target.IdentifierName);
+                var control = ((dynamic)form.Parent.Designer).Controls(_view.Target.IdentifierName);
 
                 foreach (var handler in _declarations.FindEventHandlers(_view.Target))
                 {
@@ -376,30 +347,30 @@ private string GetReplacementLine(string content, string target, string newName,
             // 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);
+            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)
         {
-            var targetModule = _parseResult.ComponentParseResults.SingleOrDefault(m => m.QualifiedName == target.QualifiedName.QualifiedModuleName);
+            var targetModule = _parseResult.ComponentParseResults.SingleOrDefault(m => m.QualifiedName == _view.Target.QualifiedName.QualifiedModuleName);
             if (targetModule == null)
             {
                 return null;
             }
 
-            var content = module.Lines[target.Selection.StartLine, 1];
+            var content = module.Lines[_view.Target.Selection.StartLine, 1];
 
             if (target.DeclarationType == DeclarationType.Parameter)
             {
-                var argContext = (VBAParser.ArgContext)target.Context;
+                var argContext = (VBAParser.ArgContext)_view.Target.Context;
                 var rewriter = targetModule.GetRewriter();
                 rewriter.Replace(argContext.ambiguousIdentifier().Start.TokenIndex, _view.NewName);
 
                 // Target.Context is an ArgContext, its parent is an ArgsListContext;
                 // the ArgsListContext's parent is the procedure context and it includes the body.
-                var context = (ParserRuleContext) target.Context.Parent.Parent;
+                var context = (ParserRuleContext)_view.Target.Context.Parent.Parent;
                 var firstTokenIndex = context.Start.TokenIndex;
                 var lastTokenIndex = -1; // will blow up if this code runs for any context other than below
 
@@ -412,8 +383,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 +446,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);