Bug fix to allow RebuildShapeCombination for indexed static property gets (dotnet#2512)

Alan Geller · KevinRansom · commit fe2002bab43f · 2017-03-07T09:59:43.000-06:00
* Bug fix to allow RebuildShapeCombination to rebuild gets of indexed static properties

* Unit test for RebuildShapeCombination of indexed static property
diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations/FSharpQuotations.fs b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations/FSharpQuotations.fs
@@ -11,6 +11,9 @@ open Microsoft.FSharp.Quotations
 
 type E = Microsoft.FSharp.Quotations.Expr;;
 
+type StaticIndexedPropertyTest() =
+    static member IdxProp with get (n : int) = n + 1
+
 module Check =
     let argumentException f =
         let mutable ex = false
@@ -68,6 +71,17 @@ type FSharpQuotationsTests() =
                 Check.argumentException(fun () -> ExprShape.RebuildShapeCombination(shape, [wrongValue;lambda]))
         |   _ -> Assert.Fail()
 
+    [<Test>]
+    member x.ReShapeStaticIndexedProperties() = 
+        let q0 = <@ StaticIndexedPropertyTest.IdxProp 5 @>
+        match q0 with
+        |   ExprShape.ShapeCombination(shape, args) ->
+                try
+                    ExprShape.RebuildShapeCombination(shape, args) |> ignore
+                with
+                | _ -> Assert.Fail()
+        |   _ -> Assert.Fail()
+
     [<Test>]
     member x.GetConstructorFiltersOutStaticConstructor() =
         ignore <@ System.Exception() @>
diff --git a/src/fsharp/FSharp.Core/quotations.fs b/src/fsharp/FSharp.Core/quotations.fs
@@ -2171,7 +2171,7 @@ module ExprShape =
             | NewTupleOp(ty),_    -> mkNewTupleWithType(ty, args)
             | TupleGetOp(ty,i),[arg] -> mkTupleGet(ty,i,arg)
             | InstancePropGetOp(pinfo),(obj::args)    -> mkInstancePropGet(obj,pinfo,args)
-            | StaticPropGetOp(pinfo),[] -> mkStaticPropGet(pinfo,args)
+            | StaticPropGetOp(pinfo),_ -> mkStaticPropGet(pinfo,args)
             | InstancePropSetOp(pinfo),obj::(FrontAndBack(args,v)) -> mkInstancePropSet(obj,pinfo,args,v)
             | StaticPropSetOp(pinfo),(FrontAndBack(args,v)) -> mkStaticPropSet(pinfo,args,v)
             | InstanceFieldGetOp(finfo),[obj]   -> mkInstanceFieldGet(obj,finfo)
