Fixed issue #314

build_all_vs2017.bat

@@ -0,0 +1,30 @@
+@echo off
+set CONFIG=Debug
+set VisualStudioVersion=15.0
+
+for /f "usebackq tokens=*" %%i in (`vswhere -latest -requires Microsoft.Component.MSBuild -property installationPath`) do (
+  set INSTALLDIR=%%i
+)
+
+"%INSTALLDIR%\MSBuild\%VisualStudioVersion%\bin\MSBuild.exe" ".\moq.sln" /t:restore /t:build
+
+if not %ERRORLEVEL%==0 goto fail 
+
+echo %time%
+echo.
+color
+
+pause
+exit /b 0
+
+:end
+
+:fail
+color 07
+
+echo.
+echo.
+echo Failed
+echo.
+pause
+exit /b 1

src/Moq/Extensions.cs

@@ -57,6 +57,11 @@ public static bool IsPropertyIndexerSetter(this MethodInfo method)
 			return method.Name.StartsWith("set_Item", StringComparison.Ordinal);
 		}
 
+		public static bool IsPropertyIndexer(this MethodInfo method)
+		{
+			return method.IsPropertyIndexerGetter() || method.IsPropertyIndexerSetter();
+		}
+
 		public static bool IsPropertySetter(this MethodInfo method)
 		{
 			return method.Name.StartsWith("set_", StringComparison.Ordinal);
@@ -91,7 +96,7 @@ public static void ThrowIfNotMockeable(this MemberExpression memberAccess)
 
 		public static bool IsMockeable(this Type typeToMock)
 		{
-			// A value type does not match any of these three 
+			// A value type does not match any of these three
 			// condition and therefore returns false.
 			return typeToMock.GetTypeInfo().IsInterface || typeToMock.GetTypeInfo().IsAbstract || typeToMock.IsDelegate() || (typeToMock.GetTypeInfo().IsClass && !typeToMock.GetTypeInfo().IsSealed);
 		}
@@ -293,4 +298,4 @@ private static void AddPropertiesInDepthFirstOrderTo(this Type type, List<Proper
 			}
 		}
 	}
-}
+}

src/Moq/FluentMockVisitor.cs

@@ -100,10 +100,10 @@ private MethodInfo GetTargetMethod(Type objectType, Type returnType)
 			{
 				//.Setup(mock => mock.Solution)
 				return typeof(Mock<>)
-				       .MakeGenericType(objectType)
-				       .GetMethods("Setup")
-				       .First(m => m.IsGenericMethod)
-				       .MakeGenericMethod(returnType);
+					   .MakeGenericType(objectType)
+					   .GetMethods("Setup")
+					   .First(m => m.IsGenericMethod)
+					   .MakeGenericMethod(returnType);
 			}
 			else
 			{
@@ -115,11 +115,11 @@ private MethodInfo GetTargetMethod(Type objectType, Type returnType)
 
 		// Args like: string IFoo (mock => mock.Value)
 		private Expression TranslateFluent(Type objectType,
-		                                   Type returnType,
-		                                   MethodInfo targetMethod,
-		                                   Expression instance,
-		                                   ParameterExpression lambdaParam,
-		                                   Expression lambdaBody)
+										   Type returnType,
+										   MethodInfo targetMethod,
+										   Expression instance,
+										   ParameterExpression lambdaParam,
+										   Expression lambdaBody)
 		{
 			var funcType = typeof(Func<,>).MakeGenericType(objectType, returnType);
 
@@ -166,7 +166,9 @@ private static Mock<TResult> FluentMock<T, TResult>(Mock<T> mock, Expression<Fun
 
 			Mock fluentMock;
 			MockWithWrappedMockObject innerMock;
-			if (mock.InnerMocks.TryGetValue(info, out innerMock))
+
+			//When property is indexer, the method name is same, in this case i have return other instance of mock.
+			if (!info.IsPropertyIndexer() && mock.InnerMocks.TryGetValue(info, out innerMock))
 			{
 				fluentMock = innerMock.Mock;
 			}
@@ -191,4 +193,4 @@ private static Mock<TResult> FluentMock<T, TResult>(Mock<T> mock, Expression<Fun
 			return (Mock<TResult>)fluentMock;
 		}
 	}
-}
+}

tests/Moq.Tests/Regressions/FluentMockVisitorIssues.cs

@@ -0,0 +1,35 @@
+using Xunit;
+
+namespace Moq.Tests.Regressions
+{
+	public class FluentMockVisitorIssues
+	{
+		[Fact]
+		public void WhenQueryingWithTwoIndexes_ThenSetsThemDirectly1()
+		{
+			var foo = Mock.Of<IFoo>(x => x[0].Value == "hello" && x[1].Value == "goodbye");
+
+			Assert.Equal("hello", foo[0].Value); // Fails here as foo[0] is the same object as foo[1] and foo[1].Value == "goodbye", Fixed!
+			Assert.Equal("goodbye", foo[1].Value);
+		}
+
+		[Fact]
+		public void WhenQueryingWithTwoIndexes_ThenSetsThemDirectly2()
+		{
+			var foo = Mock.Of<IFoo>(x => x[0] == Mock.Of<IBar>(b => b.Value == "hello") && x[1] == Mock.Of<IBar>(b => b.Value == "goodbye"));
+
+			Assert.Equal("hello", foo[0].Value); // These pass no problem
+			Assert.Equal("goodbye", foo[1].Value);
+		}
+
+		public interface IFoo
+		{
+			IBar this[int index] { get; }
+		}
+
+		public interface IBar
+		{
+			string Value { get; }
+		}
+	}
+}