Redo letter signature adjustment

retailcoder · May 18, 2015 · 55c6d44 · 55c6d44
1 parent f712225
commit 55c6d44
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs b/RetailCoder.VBE/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs
@@ -105,12 +105,6 @@ private void AdjustReferences()
                 }
                 catch
                 {
-                    // update letter methods - needs proper fixing
-                    if (reference.Context.Parent.GetText().Contains("Property Let"))
-                    {
-                        AdjustSignature(reference);
-                    }
-
                     continue;
                 }
 
@@ -169,7 +163,7 @@ private void AdjustSignature()
             var argList = (VBAParser.ArgListContext)proc.argList();
             var module = _view.Target.QualifiedName.QualifiedModuleName.Component.CodeModule;
 
-            // if we are reordering a property getter, check if we need to reorder a setter too
+            // if we are reordering a property getter, check if we need to reorder a letter/setter too
             if (_view.Target.DeclarationType == DeclarationType.PropertyGet)
             {
                 var setter = _declarations.Items.FirstOrDefault(item => item.ParentScope == _view.Target.ParentScope &&
@@ -180,6 +174,15 @@ private void AdjustSignature()
                 {
                     AdjustSignature(setter);
                 }
+
+                var letter = _declarations.Items.FirstOrDefault(item => item.ParentScope == _view.Target.ParentScope &&
+                              item.IdentifierName == _view.Target.IdentifierName &&
+                              item.DeclarationType == DeclarationType.PropertyLet);
+
+                if (letter != null)
+                {
+                    AdjustSignature(letter);
+                }
             }
 
             RewriteSignature(argList, module);
@@ -200,7 +203,7 @@ private void AdjustSignature(Declaration reference)
             var module = reference.QualifiedName.QualifiedModuleName.Component.CodeModule;
             VBAParser.ArgListContext argList;
 
-            if (reference.DeclarationType == DeclarationType.PropertySet)
+            if (reference.DeclarationType == DeclarationType.PropertySet || reference.DeclarationType == DeclarationType.PropertyLet)
             {
                 argList = (VBAParser.ArgListContext)proc.children[0].argList();
             }