Merge branch 'main' into merges/release/dev17.6-to-main

.devcontainer/Dockerfile

@@ -23,4 +23,4 @@ RUN apt-get update \
 ENV DEBIAN_FRONTEND=dialog
 
 # Make sure we can build using plain dotnet
-ENV BUILDING_USING_DOTNET=true
\ No newline at end of file
+ENV BUILDING_USING_DOTNET="true"
\ No newline at end of file

.devcontainer/devcontainer.json

@@ -15,9 +15,6 @@
         "storage": "32gb"
     },
 
-    // Default settings are set in .vscode/settings.json
-    "settings": {},
-
     // Add the IDs of extensions you want installed when the container is created.
     "extensions": [
         "ms-dotnettools.csharp",

.vscode/settings.json

@@ -16,8 +16,8 @@
         "*.fs": "${capture}.fsi"
     },
     "FSharp.suggestGitignore": false,
-    "FSharp.enableMSBuildProjectGraph": true,
-    "FSharp.enableAdaptiveLspServer": false,
+    "FSharp.enableMSBuildProjectGraph": false,
+    "FSharp.enableAdaptiveLspServer": true,
     "FSharp.workspacePath": "FSharp.Compiler.Service.sln",
     "FSharp.workspaceModePeekDeepLevel": 1,
     "FSharp.enableBackgroundServices": false,
@@ -35,7 +35,7 @@
     "csharp.suppressDotnetInstallWarning": true,
     "csharp.suppressDotnetRestoreNotification": true,
     "csharp.suppressHiddenDiagnostics": true,
-    "omnisharp.autoStart": true,
+    "omnisharp.autoStart": false,
     "omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
     "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
     "omnisharp.disableMSBuildDiagnosticWarning": true,

Directory.Build.props

@@ -11,7 +11,12 @@
    All settings below can be overriden via CLI switches if needed. -->
 
   <PropertyGroup Condition="'$(SolutionName)' == 'FSharp.Compiler.Service' and '$(BUILDING_USING_DOTNET)' != 'false'">
-      <BUILDING_USING_DOTNET Condition="'$(BUILDING_USING_DOTNET)' == ''">true</BUILDING_USING_DOTNET>
+      <BUILDING_USING_DOTNET>true</BUILDING_USING_DOTNET>
+  </PropertyGroup>
+
+  <!-- Temporary workaround if proj-info is used, allows Ionide's evaluation to work correctly. -->
+  <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' != 'false' and '$(DotnetProjInfo)' == 'true'">
+      <BUILDING_USING_DOTNET>true</BUILDING_USING_DOTNET>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/Directory.Build.props.user" Condition = "Exists('$(RepoRoot)/Directory.Build.props.user')" />
@@ -25,7 +30,6 @@
     <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
     <FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net7.0/fslex.dll</FsLexPath>
     <FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net7.0/fsyacc.dll</FsYaccPath>
-    <OtherFlags>$(OtherFlags) --test:ParallelCheckingWithSignatureFilesOn</OtherFlags>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'"/>

eng/Build.ps1

@@ -243,6 +243,10 @@ function BuildSolution([string] $solutionName) {
     # Do not set the property to true explicitly, since that would override value projects might set.
     $suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
 
+    $BUILDING_USING_DOTNET_ORIG = $env:BUILDING_USING_DOTNET
+
+    $env:BUILDING_USING_DOTNET="false"
+
     MSBuild $toolsetBuildProj `
         $bl `
         /p:Configuration=$configuration `
@@ -261,10 +265,11 @@ function BuildSolution([string] $solutionName) {
         /p:TestTargetFrameworks=$testTargetFrameworks `
         /p:DotNetBuildFromSource=$sourceBuild `
         /p:CompressAllMetadata=$CompressAllMetadata `
-        /p:BUILDING_USING_DOTNET=false `
         /v:$verbosity `
         $suppressExtensionDeployment `
         @properties
+        
+    $env:BUILDING_USING_DOTNET=$BUILDING_USING_DOTNET_ORIG
 }
 
 function TestAndAddToPath([string] $testPath) {
@@ -674,14 +679,14 @@ try {
         $exitCode = Exec-Process "$dotnetExe" "restore $RepoRoot\buildtools\checkpackages\FSharp.Compiler.Service_notshipped.fsproj"
         if ($exitCode -eq 0) {
             Write-Host -ForegroundColor Red "Command succeeded but was expected to fail: this means that the fsharp.compiler.service nuget package is already published"
-            Write-Host -ForegroundColor Red "Modify the version number of FSharp.Compiler.Servoce to be published"
+            Write-Host -ForegroundColor Red "Modify the version number of FSharp.Compiler.Service to be published"
             $verifypackageshipstatusFailed = $True
         }
 
         $exitCode = Exec-Process "$dotnetExe" "restore $RepoRoot\buildtools\checkpackages\FSharp.Core_notshipped.fsproj"
         if ($exitCode -eq 0) {
             Write-Host -ForegroundColor Red "Command succeeded but was expected to fail: this means that the fsharp.core nuget package is already published"
-            Write-Host -ForegroundColor Red "Modify the version number of FSharp.Compiler.Servoce to be published"
+            Write-Host -ForegroundColor Red "Modify the version number of FSharp.Compiler.Service to be published"
             $verifypackageshipstatusFailed = $True
         }
         if (-not $verifypackageshipstatusFailed)

eng/build.sh

@@ -207,6 +207,7 @@ function TestUsingNUnit() {
 }
 
 function BuildSolution {
+  BUILDING_USING_DOTNET=false
   BuildCategory="Build"
   BuildMessage="Error preparing build"
   local solution="FSharp.sln"
@@ -295,7 +296,6 @@ function BuildSolution {
       /p:QuietRestore=$quiet_restore \
       /p:QuietRestoreBinaryLog="$binary_log" \
       /p:ArcadeBuildFromSource=$source_build \
-      /p:BUILDING_USING_DOTNET=false \
       $properties
   fi
 }

src/Compiler/SyntaxTree/SyntaxTree.fs

@@ -881,7 +881,7 @@ type SynSimplePats =
 type SynArgPats =
     | Pats of pats: SynPat list
 
-    | NamePatPairs of pats: (Ident * range * SynPat) list * range: range * trivia: SynArgPatsNamePatPairsTrivia
+    | NamePatPairs of pats: (Ident * range option * SynPat) list * range: range * trivia: SynArgPatsNamePatPairsTrivia
 
     member x.Patterns =
         match x with

src/Compiler/SyntaxTree/SyntaxTree.fsi

@@ -1025,7 +1025,7 @@ type SynSimplePats =
 type SynArgPats =
     | Pats of pats: SynPat list
 
-    | NamePatPairs of pats: (Ident * range * SynPat) list * range: range * trivia: SynArgPatsNamePatPairsTrivia
+    | NamePatPairs of pats: (Ident * range option * SynPat) list * range: range * trivia: SynArgPatsNamePatPairsTrivia
 
     member Patterns: SynPat list
 

src/Compiler/pars.fsy

@@ -3133,7 +3133,12 @@ namePatPairs:
 namePatPair:
    | ident EQUALS parenPattern
      { let mEquals = rhs parseState 2
-       ($1, mEquals, $3) }
+       ($1, Some mEquals, $3) }
+   | ident EQUALS recover
+     { let mEquals = rhs parseState 2
+       ($1, Some mEquals, patFromParseError (SynPat.Wild mEquals.EndRange)) }
+   | ident recover
+     { ($1, None, patFromParseError (SynPat.Wild $1.idRange.EndRange)) }
 
 constrPattern:
   | atomicPatternLongIdent explicitValTyparDecls

tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj

@@ -249,7 +249,7 @@
 
   <ItemGroup>
     <None Include="**\*.cs;**\*.fs;**\*.fsx;**\*.fsi" Exclude="@(Compile)">
-      <Link>%(RelativeDir)\TestSource\%(Filename)%(Extension)</Link>
+      <Link>%(RelativeDir)TestSource\%(Filename)%(Extension)</Link>
     </None>
   </ItemGroup>
 

tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl

@@ -5770,8 +5770,8 @@ FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.SyntaxTrivia.Syn
 FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia trivia
 FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.Text.Range get_range()
 FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.Text.Range range
-FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,FSharp.Compiler.Text.Range,FSharp.Compiler.Syntax.SynPat]] get_pats()
-FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,FSharp.Compiler.Text.Range,FSharp.Compiler.Syntax.SynPat]] pats
+FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range],FSharp.Compiler.Syntax.SynPat]] get_pats()
+FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range],FSharp.Compiler.Syntax.SynPat]] pats
 FSharp.Compiler.Syntax.SynArgPats+Pats: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat] get_pats()
 FSharp.Compiler.Syntax.SynArgPats+Pats: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat] pats
 FSharp.Compiler.Syntax.SynArgPats+Tags: Int32 NamePatPairs
@@ -5780,7 +5780,7 @@ FSharp.Compiler.Syntax.SynArgPats: Boolean IsNamePatPairs
 FSharp.Compiler.Syntax.SynArgPats: Boolean IsPats
 FSharp.Compiler.Syntax.SynArgPats: Boolean get_IsNamePatPairs()
 FSharp.Compiler.Syntax.SynArgPats: Boolean get_IsPats()
-FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats NewNamePatPairs(Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,FSharp.Compiler.Text.Range,FSharp.Compiler.Syntax.SynPat]], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia)
+FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats NewNamePatPairs(Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range],FSharp.Compiler.Syntax.SynPat]], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia)
 FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats NewPats(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat])
 FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats+NamePatPairs
 FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats+Pats

tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl

@@ -5770,8 +5770,8 @@ FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.SyntaxTrivia.Syn
 FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia trivia
 FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.Text.Range get_range()
 FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: FSharp.Compiler.Text.Range range
-FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,FSharp.Compiler.Text.Range,FSharp.Compiler.Syntax.SynPat]] get_pats()
-FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,FSharp.Compiler.Text.Range,FSharp.Compiler.Syntax.SynPat]] pats
+FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range],FSharp.Compiler.Syntax.SynPat]] get_pats()
+FSharp.Compiler.Syntax.SynArgPats+NamePatPairs: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range],FSharp.Compiler.Syntax.SynPat]] pats
 FSharp.Compiler.Syntax.SynArgPats+Pats: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat] get_pats()
 FSharp.Compiler.Syntax.SynArgPats+Pats: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat] pats
 FSharp.Compiler.Syntax.SynArgPats+Tags: Int32 NamePatPairs
@@ -5780,7 +5780,7 @@ FSharp.Compiler.Syntax.SynArgPats: Boolean IsNamePatPairs
 FSharp.Compiler.Syntax.SynArgPats: Boolean IsPats
 FSharp.Compiler.Syntax.SynArgPats: Boolean get_IsNamePatPairs()
 FSharp.Compiler.Syntax.SynArgPats: Boolean get_IsPats()
-FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats NewNamePatPairs(Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,FSharp.Compiler.Text.Range,FSharp.Compiler.Syntax.SynPat]], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia)
+FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats NewNamePatPairs(Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`3[FSharp.Compiler.Syntax.Ident,Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range],FSharp.Compiler.Syntax.SynPat]], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia)
 FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats NewPats(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat])
 FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats+NamePatPairs
 FSharp.Compiler.Syntax.SynArgPats: FSharp.Compiler.Syntax.SynArgPats+Pats

tests/service/data/SyntaxTree/Pattern/NamedPatPairRecoverAfterEquals.fs

+match x with
+| Y(z = ) -> ()

tests/service/data/SyntaxTree/Pattern/NamedPatPairRecoverAfterEquals.fs.bsl

+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/NamedPatPairRecoverAfterEquals.fs", false,
+      QualifiedNameOfFile NamedPatPairRecoverAfterEquals, [], [],
+      [SynModuleOrNamespace
+         ([NamedPatPairRecoverAfterEquals], false, AnonModule,
+          [Expr
+             (Match
+                (Yes (1,0--1,12), Ident x,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Y], [], [None]), None, None,
+                        NamePatPairs
+                          ([(z, Some (2,6--2,7),
+                             FromParseError (Wild (2,7--2,7), (2,7--2,7)))],
+                           (2,4--2,9), { ParenRange = (2,3--2,9) }), None,
+                        (2,2--2,9)), None, Const (Unit, (2,13--2,15)),
+                     (2,2--2,15), Yes, { ArrowRange = Some (2,10--2,12)
+                                         BarRange = Some (2,0--2,1) })],
+                 (1,0--2,15), { MatchKeyword = (1,0--1,5)
+                                WithKeyword = (1,8--1,12) }), (1,0--2,15))],
+          PreXmlDocEmpty, [], None, (1,0--3,0), { LeadingKeyword = None })],
+      (true, true), { ConditionalDirectives = []
+                      CodeComments = [] }, set []))
+
+(2,8)-(2,9) parse error Unexpected symbol ')' in pattern

tests/service/data/SyntaxTree/Pattern/NamedPatPairRecoverAfterIdentifier.fs

+match x with
+| Y(a = 1; b = 2; c) -> ()

tests/service/data/SyntaxTree/Pattern/NamedPatPairRecoverAfterIdentifier.fs.bsl

+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/NamedPatPairRecoverAfterIdentifier.fs", false,
+      QualifiedNameOfFile NamedPatPairRecoverAfterIdentifier, [], [],
+      [SynModuleOrNamespace
+         ([NamedPatPairRecoverAfterIdentifier], false, AnonModule,
+          [Expr
+             (Match
+                (Yes (1,0--1,12), Ident x,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Y], [], [None]), None, None,
+                        NamePatPairs
+                          ([(a, Some (2,6--2,7), Const (Int32 1, (2,8--2,9)));
+                            (b, Some (2,13--2,14), Const (Int32 2, (2,15--2,16)));
+                            (c, None,
+                             FromParseError (Wild (2,19--2,19), (2,19--2,19)))],
+                           (2,4--2,20), { ParenRange = (2,3--2,20) }), None,
+                        (2,2--2,20)), None, Const (Unit, (2,24--2,26)),
+                     (2,2--2,26), Yes, { ArrowRange = Some (2,21--2,23)
+                                         BarRange = Some (2,0--2,1) })],
+                 (1,0--2,26), { MatchKeyword = (1,0--1,5)
+                                WithKeyword = (1,8--1,12) }), (1,0--2,26))],
+          PreXmlDocEmpty, [], None, (1,0--3,0), { LeadingKeyword = None })],
+      (true, true), { ConditionalDirectives = []
+                      CodeComments = [] }, set []))
+
+(2,19)-(2,20) parse error Unexpected symbol ')' in pattern. Expected '=' or other token.

tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl

@@ -11,7 +11,7 @@ ImplFile
                     (LongIdent
                        (SynLongIdent ([OnePartData], [], [None]), None, None,
                         NamePatPairs
-                          ([(part1, (4,10--4,11),
+                          ([(part1, Some (4,10--4,11),
                              Named
                                (SynIdent (p1, None), false, None, (4,12--4,14)))],
                            (4,4--5,13), { ParenRange = (3,13--5,13) }), None,

tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl

@@ -14,7 +14,7 @@ ImplFile
                     (LongIdent
                        (SynLongIdent ([X], [], [None]), None, None,
                         NamePatPairs
-                          ([(Y, (3,7--3,8),
+                          ([(Y, Some (3,7--3,8),
                              Named
                                (SynIdent (y, None), false, None, (3,9--3,10)))],
                            (3,4--3,11), { ParenRange = (3,3--3,11) }), None,