Another fix for issue devlooped#278 that no longer causes issue devlooped#295.

There is still problematic code in the Interceptor for comparing the arguments of calls, but for now it no longer causes a problem with propeties with arguments as the expression string builder now reports the arguments for property reads.
I've added a comment explaining the flaws (as I see them) in the Interceptor code in the hope that it will help when someone next as a problem, or at least stops them missing the same thing as I did earlier.

Author: MatKubicki

Source/ExpressionStringBuilder.cs

@@ -343,15 +343,19 @@ private void ToStringMethodCall(MethodCallExpression node)
 				else if (node.Method.IsPropertyIndexerSetter())
 				{
 					this.builder.Append("[");
-					AsCommaSeparatedValues(node.Arguments
-						.Skip(paramFrom)
-						.Take(node.Arguments.Count - paramFrom), ToString);
+					AsCommaSeparatedValues(node.Arguments.Skip(paramFrom), ToString);
 					this.builder.Append("] = ");
 					ToString(node.Arguments.Last());
 				}
 				else if (node.Method.IsPropertyGetter())
 				{
-					this.builder.Append(".").Append(node.Method.Name.Substring(4));
+                    this.builder.Append(".").Append(node.Method.Name.Substring(4));
+                    if (node.Arguments.Count > paramFrom)
+                    {
+                        this.builder.Append("[");
+                        AsCommaSeparatedValues(node.Arguments.Skip(paramFrom), ToString);
+                        this.builder.Append("]");
+                    }					
 				}
 				else if (node.Method.IsPropertySetter())
 				{

Source/Interceptor.cs

@@ -169,20 +169,20 @@ public override bool Equals(object obj)
 				}
 
 				var eq = key.fixedString == this.fixedString && key.values.Count == this.values.Count;
-                if(!eq)
+
+                //the code below is broken as it uses an OR when checking the arguments, this means that if any pair of arguments match 
+                //the result is a match.
+                //This is only going to hit some edge cases as for the most part the fixed string above spots arguments correctly.
+                //Fixing this really needs a reworking of the GetHashCode, and also some sorting out of how to compare value types that have been
+                //boxed correctly (another problem this code has)
+                var index = 0;
+                while (eq && index < this.values.Count)
                 {
-                    return false;
+                    eq |= this.values[index] == key.values[index];
+                    index++;
                 }
 
-				for(int index=0; index < values.Count; index++)
-				{
-                    if (this.values[index] != key.values[index])
-                    {
-                        return false;
-                    }
-				}
-
-				return eq;
+                return eq;
 			}
 
             public override int GetHashCode()

UnitTests/MatchersFixture.cs

@@ -266,7 +266,20 @@ public void MatchingNonNullableValueTypeForNullableParameterDoesNotMatchNull()
 			Assert.Equal(0, mock.Object.TakesNullableParameter(null));
 		}
 
-		private int GetToRange()
+        [Fact]
+        public void MultipleMatchingSetupsWithMultiplValueTypeArgumentsReplaceEachOtherForVerify()
+        {
+            var mock = new Mock<IFoo>();
+
+            mock.Setup(x => x.TakesTwoValueTypes(1, 2)).Verifiable();
+            mock.Setup(x => x.TakesTwoValueTypes(1, 2)).Verifiable();
+
+            mock.Object.TakesTwoValueTypes(1, 2);
+
+            mock.Verify();
+        }
+        
+        private int GetToRange()
 		{
 			return 5;
 		}
@@ -283,6 +296,7 @@ public interface IFoo
 			int DoAddition(int[] numbers);
 			int[] Items { get; set; }
 			int TakesNullableParameter(int? value);
-		}
+            void TakesTwoValueTypes(int a, int b);
+        }
 	}
 }