Merge pull request #1283 from forki/record-1280

Better error message when a record was given

Author: dsyme

src/fsharp/FSComp.txt

@@ -959,7 +959,6 @@ lexfltSeparatorTokensOfPatternMatchMisaligned,"The '|' tokens separating rules o
 1126,nrGlobalUsedOnlyAsFirstName,"'global' may only be used as the first name in a qualified path"
 1127,nrIsNotConstructorOrLiteral,"This is not a constructor or literal, or a constructor is being used incorrectly"
 1128,nrUnexpectedEmptyLongId,"Unexpected empty long identifier"
-1129,nrTypeDoesNotContainSuchField,"The type '%s' does not contain a field '%s'"
 1129,nrRecordDoesNotContainSuchLabel,"The record type '%s' does not contain a label '%s'."
 1130,nrInvalidFieldLabel,"Invalid field label"
 1132,nrInvalidExpression,"Invalid expression '%s'"

src/fsharp/NameResolution.fs

@@ -2563,17 +2563,7 @@ let ResolveFieldPrim (ncenv:NameResolver) nenv ad typ (mp,id:Ident) allFields =
     let m = id.idRange
     match mp with 
     | [] -> 
-        if isAppTy g typ then 
-            match ncenv.InfoReader.TryFindRecdOrClassFieldInfoOfType(id.idText,m,typ) with
-            | Some (RecdFieldInfo(_,rfref)) -> [ResolutionInfo.Empty, FieldResolution(rfref,false)]
-            | None ->
-                let typeName = NicePrint.minimalStringOfType nenv.eDisplayEnv typ        
-                if isRecdTy g typ then
-                    // record label doesn't belong to record type -> predict other labels of same record                    
-                    error(Error(SuggestOtherLabelsOfSameRecordType nenv typeName id allFields,m))
-                else
-                    error(Error(FSComp.SR.nrTypeDoesNotContainSuchField(typeName, id.idText),m))
-        else 
+        let lookup() =
             let frefs = 
                 try Map.find id.idText nenv.eFieldLabels 
                 with :? KeyNotFoundException ->
@@ -2584,7 +2574,19 @@ let ResolveFieldPrim (ncenv:NameResolver) nenv ad typ (mp,id:Ident) allFields =
             frefs 
             |> ListSet.setify (fun fref1 fref2 -> tyconRefEq g fref1.TyconRef fref2.TyconRef)
             |> List.map (fun x -> ResolutionInfo.Empty, FieldResolution(x,false))
-                        
+
+        if isAppTy g typ then 
+            match ncenv.InfoReader.TryFindRecdOrClassFieldInfoOfType(id.idText,m,typ) with
+            | Some (RecdFieldInfo(_,rfref)) -> [ResolutionInfo.Empty, FieldResolution(rfref,false)]
+            | None ->
+                let typeName = NicePrint.minimalStringOfType nenv.eDisplayEnv typ        
+                if isRecdTy g typ then
+                    // record label doesn't belong to record type -> predict other labels of same record                    
+                    error(Error(SuggestOtherLabelsOfSameRecordType nenv typeName id allFields,m))
+                else
+                    lookup()
+        else 
+            lookup()            
     | _ -> 
         let lid = (mp@[id])
         let tyconSearch ad = 

src/fsharp/TypeChecker.fs

@@ -6647,7 +6647,7 @@ and TcRecdExpr cenv overallTy env tpenv (inherits, optOrigExpr, flds, mWholeExpr
             ]
         match flds with 
         | [] -> []
-        | _ -> 
+        | _ ->
             let tcref,_,fldsList = BuildFieldMap cenv env (isSome optOrigExpr) overallTy flds mWholeExpr
             let _,_,_,gtyp = infoOfTyconRef mWholeExpr tcref
             UnifyTypes cenv env mWholeExpr overallTy gtyp      

tests/fsharpqa/Source/Conformance/BasicTypeAndModuleDefinitions/RecordTypes/E_RecordCloning01.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #TypesAndModules #Records 
 // Verify error when trying to clone a non-record type
-//<Expects id="FS1129" status="error" span="(7,39)">The type 'int \[\]' does not contain a field 'B'$</Expects>
+//<Expects id="FS0001" status="error" span="(7,17)">This expression was expected to have type</Expects>
 
 type RecType = { A : int; B : string }
 

tests/fsharpqa/Source/Conformance/DeclarationElements/MemberDefinitions/MethodsAndProperties/E_SettersMustHaveUnit01.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DeclarationElements #MemberDefinitions #MethodsAndProperties 
 // Verify property setters must have type unit
-//<Expects id="FS1129" status="error" span="(10,67)">The type 'unit' does not contain a field 'immutStr'</Expects>
+//<Expects id="FS0001" status="error" span="(10,66)">This expression was expected to have type</Expects>
 
 type immut =       
   {

tests/fsharpqa/Source/Warnings/InvalidRecord.fs

@@ -0,0 +1,9 @@
+// #Warnings
+//<Expects status="Error" span="(7,13)" id="FS0001">This expression was expected to have type</Expects>
+
+type Record = {field1:int; field2:int}
+let doSomething (xs) = List.map (fun {field1=x} -> x) xs
+
+doSomething {Record.field1=0; field2=0}
+    
+exit 0

tests/fsharpqa/Source/Warnings/env.lst

@@ -2,6 +2,7 @@
 	SOURCE=WarnIfMissingElseBranch.fs # WarnIfMissingElseBranch.fs
 	SOURCE=ReturnInsteadOfReturnBang.fs # ReturnInsteadOfReturnBang.fs
 	SOURCE=YieldInsteadOfYieldBang.fs # YieldInsteadOfYieldBang.fs
+	SOURCE=InvalidRecord.fs # InvalidRecord.fs
 	SOURCE=CommaInRecCtor.fs # CommaInRecCtor.fs
 	SOURCE=ValidCommaInRecCtor.fs # ValidCommaInRecCtor.fs
 	SOURCE=AccessOfTypeAbbreviation.fs # AccessOfTypeAbbreviation.fs