Merge pull request #549 from dsyme/fix-exprs

fix expressions

Author: dsyme

src/fsharp/vs/Exprs.fs

@@ -429,7 +429,7 @@ module FSharpExprConvert =
             let contf2 = 
                 match laterArgs with 
                 | [] -> contf 
-                | _ -> (fun subCallR -> (subCallR, laterArgs) ||> List.fold (fun fR arg -> E.Application (Mk2 cenv arg fR,[],[ConvExpr cenv env arg])))
+                | _ -> (fun subCallR -> (subCallR, laterArgs) ||> List.fold (fun fR arg -> E.Application (Mk2 cenv arg fR,[],[ConvExpr cenv env arg])) |> contf)
 
             if isMember then 
                 let callArgs = (objArgs::untupledCurriedArgs) |> List.concat
@@ -466,13 +466,13 @@ module FSharpExprConvert =
         | Expr.Sequential _ ->
             ConvExprPrimLinear cenv env expr (fun e -> e)
 
-        | Expr.Val(vref,_vFlags,m) -> 
-            ConvValRef cenv env m vref 
-
-        | ModuleValueOrMemberUse cenv.g (vref,vFlags,_f,_fty,tyargs,curriedArgs) when (nonNil tyargs || nonNil curriedArgs) && vref.IsMemberOrModuleBinding ->
+        | ModuleValueOrMemberUse cenv.g (vref,vFlags,_f,_fty,tyargs,curriedArgs) when (* (nonNil tyargs || nonNil curriedArgs) && *) vref.IsMemberOrModuleBinding ->
             // Process applications of top-level values in a tail-recursive way
             ConvModuleValueOrMemberUseLinear cenv env (expr,vref,vFlags,tyargs,curriedArgs) (fun e -> e)
 
+        | Expr.Val(vref,_vFlags,m) -> 
+            ConvValRef cenv env m vref 
+
         // Simple applications 
         | Expr.App(f,_fty,tyargs,args,_m) -> 
             E.Application (ConvExpr cenv env f, ConvTypes cenv tyargs, ConvExprs cenv env args) 

src/fsharp/vs/Symbols.fs

@@ -168,7 +168,7 @@ type FSharpSymbol(cenv:cenv, item: (unit -> Item), access: (FSharpSymbol -> CcuT
     member x.FullName = ItemDescriptionsImpl.FullNameOfItem cenv.g x.Item 
 
     member x.DeclarationLocation = ItemDescriptionsImpl.rangeOfItem cenv.g None x.Item
-
+    
     member x.ImplementationLocation = ItemDescriptionsImpl.rangeOfItem cenv.g (Some(false)) x.Item
 
     member x.SignatureLocation = ItemDescriptionsImpl.rangeOfItem cenv.g (Some(true)) x.Item