Merge pull request #7241 from dotnet/merges/master-to-release/dev16.3

Merge master to release/dev16.3

Author: KevinRansom

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19362.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19364.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>15f50ca6a9d0b441c9927421657fb9dc91206cc9</Sha>
+      <Sha>0c81c2bbdc49749e9940bc8858ebd16026d51277</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

global.json

@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19362.5",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19364.1",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

tests/fsharp/Compiler/ErrorMessages/ConstructorTests.fs

@@ -0,0 +1,115 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.UnitTests
+
+open NUnit.Framework
+open FSharp.Compiler.SourceCodeServices
+
+[<TestFixture>]
+module ``Constructor`` =
+
+    [<Test>]
+    let ``Invalid Record``() =
+        CompilerAssert.TypeCheckWithErrors
+            """
+type Record = {field1:int; field2:int}
+let doSomething (xs) = List.map (fun {field1=x} -> x) xs
+
+doSomething {Record.field1=0; field2=0}
+            """
+            [|
+                FSharpErrorSeverity.Error, 1, (5, 13, 5, 40), "This expression was expected to have type\n    'Record list'    \nbut here has type\n    'Record'    "
+                FSharpErrorSeverity.Warning, 20, (5, 1, 5, 40), "The result of this expression has type 'int list' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'."
+            |]
+
+    [<Test>]
+    let ``Comma In Rec Ctor``() =
+        CompilerAssert.TypeCheckWithErrors
+            """
+type Person = { Name : string; Age : int; City : string }
+let x = { Name = "Isaac", Age = 21, City = "London" }
+            """
+            [|
+                FSharpErrorSeverity.Error, 1, (3, 18, 3, 52), "This expression was expected to have type\n    'string'    \nbut here has type\n    ''a * 'b * 'c'    \r\nA ';' is used to separate field values in records. Consider replacing ',' with ';'."
+                FSharpErrorSeverity.Error, 764, (3, 9, 3, 54), "No assignment given for field 'Age' of type 'Test.Person'"
+            |]
+
+    [<Test>]
+    let ``Missing Comma In Ctor``() =
+        CompilerAssert.TypeCheckWithErrors
+            """
+type Person() =
+    member val Name = "" with get,set
+    member val Age = 0 with get,set
+
+let p =
+    Person(Name = "Fred"
+           Age = 18)
+            """
+            [|
+                FSharpErrorSeverity.Error, 39, (7, 12, 7, 16), "The value or constructor 'Name' is not defined."
+                FSharpErrorSeverity.Warning, 20, (7, 12, 7, 25), "The result of this equality expression has type 'bool' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'."
+                FSharpErrorSeverity.Error, 39, (8, 12, 8, 15), "The value or constructor 'Age' is not defined."
+                FSharpErrorSeverity.Error, 501, (7, 5, 8, 21), "The object constructor 'Person' takes 0 argument(s) but is here given 1. The required signature is 'new : unit -> Person'. If some of the arguments are meant to assign values to properties, consider separating those arguments with a comma (',')."
+            |]
+
+    [<Test>]
+    let ``Missing Ctor Value``() =
+        CompilerAssert.TypeCheckSingleError
+            """
+type Person(x:int) =
+    member val Name = "" with get,set
+    member val Age = x with get,set
+
+let p =
+    Person(Name = "Fred",
+           Age = 18)
+            """
+            FSharpErrorSeverity.Error
+            496
+            (7, 5, 8, 21)
+            "The member or object constructor 'Person' requires 1 argument(s). The required signature is 'new : x:int -> Person'."
+
+    [<Test>]
+    let ``Extra Argument In Ctor``() =
+        CompilerAssert.TypeCheckSingleError
+            """
+type Person() =
+    member val Name = "" with get,set
+    member val Age = 0 with get,set
+
+let p =
+    Person(1)
+            """
+            FSharpErrorSeverity.Error
+            501
+            (7, 5, 7, 14)
+            "The object constructor 'Person' takes 0 argument(s) but is here given 1. The required signature is 'new : unit -> Person'."
+
+    [<Test>]
+    let ``Extra Argument In Ctor2``() =
+        CompilerAssert.TypeCheckSingleError
+            """
+type Person() =
+    member val Name = "" with get,set
+    member val Age = 0 with get,set
+
+let b = 1
+
+let p =
+    Person(1=b)
+            """
+            FSharpErrorSeverity.Error
+            501
+            (9, 5, 9, 16)
+            "The object constructor 'Person' takes 0 argument(s) but is here given 1. The required signature is 'new : unit -> Person'."
+
+    [<Test>]
+    let ``Valid Comma In Rec Ctor``() =
+        CompilerAssert.Pass
+            """
+type Person = { Name : string * bool * bool }
+let Age = 22
+let City = "London"
+let x = { Name = "Isaac", Age = 21, City = "London" }
+            """

tests/fsharp/FSharpSuite.Tests.fsproj

@@ -33,6 +33,7 @@
     <Compile Include="tests.fs" />
     <Compile Include="Compiler\ILChecker.fs" />
     <Compile Include="Compiler\CompilerAssert.fs" />
+    <Compile Include="Compiler\ErrorMessages\ConstructorTests.fs" />
     <Compile Include="Compiler\ErrorMessages\AccessOfTypeAbbreviationTests.fs" />
     <Compile Include="Compiler\ErrorMessages\ElseBranchHasWrongTypeTests.fs" />
     <Compile Include="Compiler\ErrorMessages\MissingElseBranch.fs" />