fixes to integration

Author: dsyme

src/absil/il.fs

@@ -4276,7 +4276,7 @@ let rec unscopeILTypeSpecQuick (tspec:ILTypeSpec) =
     let tref = tspec.TypeRef
     let tinst = tspec.GenericArgs
     let qtref = qunscope_tref tref
-    if ILList.isEmpty tinst && isNone qtref then 
+    if ILList.isEmpty tinst && Option.isNone qtref then 
         None (* avoid reallocation in the common case *)
     else
         match qtref with 

src/fsharp/ast.fs

@@ -424,7 +424,7 @@ and
 
     /// F# syntax : struct (type * ... * type)
     // the bool is true if / rather than * follows the type
-    | StructTuple of (bool*SynType) list * range    
+    | StructTuple of (bool*SynType) list * range:range    
 
     /// F# syntax : type[]
     | Array of  int * elementType:SynType * range:range
@@ -496,7 +496,7 @@ and
     | Tuple of  exprs:SynExpr list * commaRanges:range list * range:range  // "range list" is for interstitial commas, these only matter for parsing/design-time tooling, the typechecker may munge/discard them
 
     /// F# syntax: struct (e1, ..., eN)
-    | StructTuple of  SynExpr list * range list * range  // "range list" is for interstitial commas, these only matter for parsing/design-time tooling, the typechecker may munge/discard them
+    | StructTuple of  SynExpr list * range list * range:range  // "range list" is for interstitial commas, these only matter for parsing/design-time tooling, the typechecker may munge/discard them
 
     /// F# syntax: [ e1; ...; en ], [| e1; ...; en |]
     | ArrayOrList of  isList:bool * exprs:SynExpr list * range:range 

src/fsharp/fsi/fsi.fs

@@ -378,7 +378,7 @@ type internal FsiValuePrinter(fsi: FsiEvaluationSessionHostConfig, ilGlobals, ge
                     let lay = valuePrinter.PrintValue (FsiValuePrinterMode.PrintExpr, opts, obj, objTy)
                     if isEmptyL lay then None else Some lay // suppress empty layout 
         let denv = { denv with suppressMutableKeyword = true } // suppress 'mutable' in 'val mutable it = ...'
-        let fullL = if isNone rhsL || isEmptyL rhsL.Value then
+        let fullL = if Option.isNone rhsL || isEmptyL rhsL.Value then
                       NicePrint.layoutValOrMember denv vref (* the rhs was suppressed by the printer, so no value to print *)
                     else
                       (NicePrint.layoutValOrMember denv vref ++ wordL "=") --- rhsL.Value

src/fsharp/vs/Exprs.fs

@@ -18,6 +18,8 @@ open Internal.Utilities
 [<AutoOpen>]
 module ExprTranslationImpl = 
 
+    let nonNil x = not (List.isEmpty x)
+
     type ExprTranslationEnv = 
         { //Map from Val to binding index
           vs: ValMap<unit>; 
@@ -329,7 +331,7 @@ module FSharpExprConvert =
         // Check to see if there aren't enough arguments or if there is a tuple-arity mismatch
         // If so, adjust and try again
         if curriedArgs.Length < curriedArgInfos.Length ||
-            ((List.take curriedArgInfos.Length curriedArgs,curriedArgInfos) ||> List.exists2 (fun arg argInfo -> (argInfo.Length > (tryDestTuple arg).Length))) then
+            ((List.take curriedArgInfos.Length curriedArgs,curriedArgInfos) ||> List.exists2 (fun arg argInfo -> (argInfo.Length > (tryDestRefTupleExpr arg).Length))) then
 
             // Too few arguments or incorrect tupling? Convert to a lambda and beta-reduce the 
             // partially applied arguments to 'let' bindings 
@@ -352,7 +354,7 @@ module FSharpExprConvert =
                     let numUntupledArgs = curriedArgInfo.Length 
                     (if numUntupledArgs = 0 then [] 
                         elif numUntupledArgs = 1 then [arg] 
-                        else tryDestTuple arg))
+                        else tryDestRefTupleExpr arg))
 
             let contf2 = 
                 match laterArgs with 
@@ -417,7 +419,7 @@ module FSharpExprConvert =
             E.LetRec(FlatList.toList bindsR,bodyR) 
 
         | Expr.Lambda(_,_,_,vs,b,_,_) -> 
-            let v,b = MultiLambdaToTupledLambda vs b 
+            let v,b = MultiLambdaToTupledLambda cenv.g vs b 
             let vR = ConvVal cenv v 
             let bR  = ConvExpr cenv (env.BindVal v) b 
             E.Lambda(vR, bR) 
@@ -466,8 +468,8 @@ module FSharpExprConvert =
                 let argsR = ConvExprs cenv env args
                 E.NewUnionCase(typR, mkR, argsR) 
 
-            | TOp.Tuple,tyargs,_ -> 
-                let tyR = ConvType cenv (mkTupledTy cenv.g tyargs)
+            | TOp.Tuple tupInfo,tyargs,_ -> 
+                let tyR = ConvType cenv (mkAnyTupledTy cenv.g tupInfo tyargs)
                 let argsR = ConvExprs cenv env args
                 E.NewTuple(tyR, argsR) 
 
@@ -502,8 +504,8 @@ module FSharpExprConvert =
                 let typR = ConvType cenv (mkAppTy rfref.TyconRef tyargs)
                 E.FSharpFieldGet(Some objR, typR, projR) 
 
-            | TOp.TupleFieldGet(n),tyargs,[e] -> 
-                let tyR = ConvType cenv (mkTupledTy cenv.g tyargs)
+            | TOp.TupleFieldGet(tupInfo,n),tyargs,[e] -> 
+                let tyR = ConvType cenv (mkAnyTupledTy cenv.g tupInfo tyargs)
                 E.TupleGet(tyR, n, ConvExpr cenv env e) 
 
             | TOp.ILAsm([ I_ldfld(_,_,fspec) ],_), enclTypeArgs, [obj] -> 
@@ -679,7 +681,7 @@ module FSharpExprConvert =
             let envinner = env.BindVal v
             Some(vR,rhsR),envinner
 
-    and ConvILCall cenv env (isNewObj, valUseFlags, ilMethRef, enclTypeArgs, methTypeArgs, callArgs, m) =
+    and ConvILCall (cenv:Impl.cenv) env (isNewObj, valUseFlags, ilMethRef, enclTypeArgs, methTypeArgs, callArgs, m) =
         let isNewObj = (isNewObj || (match valUseFlags with CtorValUsedAsSuperInit | CtorValUsedAsSelfInit -> true | _ -> false))
         let methName = ilMethRef.Name
         let isPropGet = methName.StartsWith("get_",System.StringComparison.Ordinal)
@@ -863,7 +865,7 @@ module FSharpExprConvert =
                     | Some ty -> ty
 
                 let linkageType = 
-                    let ty = mkIteratedFunTy (List.map (mkTupledTy cenv.g) argtys) rty
+                    let ty = mkIteratedFunTy (List.map (mkRefTupledTy cenv.g) argtys) rty
                     let ty = if isStatic then ty else mkFunTy enclosingType ty 
                     tryMkForallTy (typars1 @ typars2) ty
 

src/fsharp/vs/Symbols.fs

@@ -1869,7 +1869,7 @@ and FSharpType(cenv, typ:TType) =
             | TType_var tp  -> 10100 + int32 tp.Stamp
             | TType_app (tc1,b1)  -> 10200 + int32 tc1.Stamp + List.sumBy hashType b1
             | TType_ucase _   -> 10300  // shouldn't occur in symbols
-            | TType_tuple l1 -> 10400 + List.sumBy hashType l1
+            | TType_tuple (_,l1) -> 10400 + List.sumBy hashType l1
             | TType_fun (dty,rty) -> 10500 + hashType dty + hashType rty
             | TType_measure _ -> 10600 
         hashType typ