Merge branch 'main' into ber.a/diagnosticData

Author: DedSec256

.github/workflows/add_to_project.yml

@@ -30,17 +30,6 @@ jobs:
           gh api -X GET "$_UrlPath/$_CurrentWorkflowID/runs" --paginate \
             | jq '.workflow_runs[] | select(.status == "completed") | .id' \
             | xargs -I{} gh api -X DELETE "/repos/$GITHUB_REPOSITORY/actions/runs"/{}
-  add_to_project:
-    name: Add issue to project
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      repository-projects: write
-    steps:
-      - uses: actions/add-to-project@v0.3.0
-        with:
-          project-url: https://github.com/orgs/dotnet/projects/126/
-          github-token: ${{ secrets.REPO_PROJECT_PAT }}
   apply-label:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request_target'

FSharp.sln

@@ -103,6 +103,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D58BFE8B-7C85-4D3B-B5F3-9A7BB90FF1EE}"
 	ProjectSection(SolutionItems) = preProject
 		src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
+		src\Compiler\FSCompCheck.fsx = src\Compiler\FSCompCheck.fsx
 	EndProjectSection
 EndProject
 Global

azure-pipelines.yml

@@ -249,7 +249,7 @@ stages:
             continueOnError: true
             condition: not(succeeded())
 
-          # Check code formatting
+          # Check FSComp.txt error code sorting and code formatting
         - job: CheckCodeFormatting
           pool:
             vmImage: $(UbuntuMachineQueueName)
@@ -270,6 +270,10 @@ stages:
             env:
               DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
             displayName: Install tools
+          - script: dotnet fsi src/Compiler/FSCompCheck.fsx
+            env:
+              DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
+            displayName: Check error code sorting in src/Compiler/FSComp.txt
           - script: dotnet fantomas . -r --check
             env:
               DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1

docs/debug-emit.md

@@ -87,7 +87,7 @@ The intended debug points for constructs are determined by syntax as follows.  P
 
 * The bodies of functions, methods, lambdas and initialization code for top-level-bindings are all processed as control flow
 
-* Each CAPITAL-EXPR below is processed as control-flow (the bodies of loops, conditionals etc.)
+* Each Upper-Cased EXPR below is processed as control-flow (the bodies of loops, conditionals etc.)
 
 * Leaf expressions are the other composite expressions like applications that are not covered by the other constructs.
 

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23424.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23451.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>93c23409e630c4f267234540b0e3557b76a53ef4</Sha>
+      <Sha>0030d238c7929b0e9b06576837b60ad90037b1d2</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23217-02">
@@ -29,14 +29,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23422.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b</Sha>
+      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23418.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>bb654cd4736e7e8cb99f1c355ce2b8f0a686ba74</Sha>
+      <Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/common/cross/toolchain.cmake

@@ -207,6 +207,7 @@ elseif(ILLUMOS)
     set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
 elseif(HAIKU)
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+    set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 
     set(TOOLSET_PREFIX ${TOOLCHAIN}-)
     function(locate_toolchain_exec exec var)
@@ -217,7 +218,6 @@ elseif(HAIKU)
         endif()
 
         find_program(EXEC_LOCATION_${exec}
-            PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
             NAMES
             "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
             "${TOOLSET_PREFIX}${exec}")

global.json

@@ -18,7 +18,7 @@
     "perl": "5.38.0.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23422.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

release-notes.md

@@ -1118,7 +1118,7 @@ Contains commits from 32b124966 to d7018737c from dotnet/fsharp. Notable changes
 * lowered allocations for several internal compiler structures
 * better error messages for anonymous record mismatches
 * FSharpChecker learned how to keep background symbol uses
-* Project cracker/project cracker tool were removed
+* The tool for parsing projects was removed
 * Better support for consuming C# in-ref parameters
 * new services around simplifying names and finding unused declarations
 * package management in scripts (in preview)

src/Compiler/Checking/AttributeChecking.fs

@@ -281,7 +281,7 @@ let CheckFSharpAttributes (g:TcGlobals) attribs m =
             | Some _ -> 
                 do! WarnD(ObsoleteWarning("", m))
             | None -> 
-                do! CompleteD
+                ()
 
             match TryFindFSharpAttribute g g.attrib_CompilerMessageAttribute attribs with
             | Some(Attrib(_, _, [ AttribStringArg s ; AttribInt32Arg n ], namedArgs, _, _, _)) ->
@@ -292,11 +292,14 @@ let CheckFSharpAttributes (g:TcGlobals) attribs m =
                     | _ -> false 
                 // If we are using a compiler that supports nameof then error 3501 is always suppressed.
                 // See attribute on FSharp.Core 'nameof'
-                if n = 3501 then do! CompleteD
-                elif isError && (not g.compilingFSharpCore || n <> 1204) then do! ErrorD msg 
-                else do! WarnD msg
+                if n = 3501 then
+                    ()
+                elif isError && (not g.compilingFSharpCore || n <> 1204) then
+                    do! ErrorD msg 
+                else
+                    do! WarnD msg
             | _ -> 
-                do! CompleteD
+                ()
 
             match TryFindFSharpAttribute g g.attrib_ExperimentalAttribute attribs with
             | Some(Attrib(_, _, [ AttribStringArg(s) ], _, _, _, _)) ->
@@ -305,20 +308,18 @@ let CheckFSharpAttributes (g:TcGlobals) attribs m =
                         true
                     else
                         g.langVersion.IsPreviewEnabled && (s.IndexOf(langVersionPrefix, StringComparison.OrdinalIgnoreCase) >= 0)
-                if isExperimentalAttributeDisabled s then
-                    do! CompleteD
-                else
+                if not (isExperimentalAttributeDisabled s) then
                     do! WarnD(Experimental(s, m))
             | Some _ ->
                 do! WarnD(Experimental(FSComp.SR.experimentalConstruct (), m))
             | _ ->
-                do! CompleteD
+                ()
 
             match TryFindFSharpAttribute g g.attrib_UnverifiableAttribute attribs with
             | Some _ -> 
                 do! WarnD(PossibleUnverifiableCode(m))
             | _ ->  
-                do! CompleteD
+                ()
         }
 
 #if !NO_TYPEPROVIDERS
@@ -418,7 +419,8 @@ let CheckMethInfoAttributes g m tyargsOpt (minfo: MethInfo) =
     trackErrors {
         match stripTyEqns g minfo.ApparentEnclosingAppType with
         | TType_app(tcref, _, _) -> do! CheckEntityAttributes g tcref m 
-        | _ -> do! CompleteD
+        | _ -> ()
+
         let search =
             BindMethInfoAttributes m minfo 
                 (fun ilAttribs -> Some(CheckILAttributes g false ilAttribs m)) 
@@ -428,8 +430,6 @@ let CheckMethInfoAttributes g m tyargsOpt (minfo: MethInfo) =
                              do! CheckFSharpAttributes g fsAttribs m
                              if Option.isNone tyargsOpt && HasFSharpAttribute g g.attrib_RequiresExplicitTypeArgumentsAttribute fsAttribs then
                                 do! ErrorD(Error(FSComp.SR.tcFunctionRequiresExplicitTypeArguments(minfo.LogicalName), m))
-                             else
-                                do! CompleteD
                         }
 
                     Some res) 
@@ -440,7 +440,7 @@ let CheckMethInfoAttributes g m tyargsOpt (minfo: MethInfo) =
 #endif 
         match search with
         | Some res -> do! res
-        | None -> do! CompleteD // no attribute = no errors 
+        | None -> () // no attribute = no errors 
 }
 
 /// Indicate if a method has 'Obsolete', 'CompilerMessageAttribute' or 'TypeProviderEditorHideMethodsAttribute'. 

src/Compiler/Checking/CheckExpressions.fs

@@ -757,6 +757,7 @@ let rec TcSynRationalConst c =
   | SynRationalConst.Integer(value = i) -> intToRational i
   | SynRationalConst.Negate(rationalConst = c2) -> NegRational (TcSynRationalConst c2)
   | SynRationalConst.Rational(numerator = p; denominator = q) -> DivRational (intToRational p) (intToRational q)
+  | SynRationalConst.Paren(rationalConst = c) -> TcSynRationalConst c
 
 /// Typecheck constant terms in expressions and patterns
 let TcConst (cenv: cenv) (overallTy: TType) m env synConst =