Use Synbinding to model and!

docs/release-notes/.FSharp.Compiler.Service/10.0.100.md

@@ -27,3 +27,4 @@
 * Simplify creation of `FSharpDiagnostics`. In a few cases, errors without ranges were assigned to the currently checked file, while in other cases they carried an empty range. The latter is now true in all cases. In a few cases, ranges at eof were corrected, while in others they were not. They are now always left uncorrected. This is a prerequisit for [#18553](https://github.com/dotnet/fsharp/issues/18553). ([PR #18610](https://github.com/dotnet/fsharp/pull/18610)).
 * `SynExprRecordField` now includes a `range` field ([PR #18617](https://github.com/dotnet/fsharp/pull/18617))
 * Mark `Range.Zero` as obsolete in favor of `Range.range0` ([PR #18664](https://github.com/dotnet/fsharp/pull/18664))
+* Use `Synbinding` to model `and!` ([PR #18805](https://github.com/dotnet/fsharp/pull/18805))

src/Compiler/Checking/Expressions/CheckComputationExpressions.fs

@@ -1860,7 +1860,7 @@ let rec TryTranslateComputationExpression
                 let m =
                     match andBangs with
                     | [] -> comp.Range
-                    | h :: _ -> h.Trivia.AndBangKeyword
+                    | h :: _ -> h.Trivia.LeadingKeyword.Range
 
                 error (Error(FSComp.SR.tcInvalidUseBangBindingNoAndBangs (), m))
 
@@ -1912,20 +1912,19 @@ let rec TryTranslateComputationExpression
                     let andBangRange =
                         match andBangBindings with
                         | [] -> comp.Range
-                        | h :: _ -> h.Trivia.AndBangKeyword
+                        | h :: _ -> h.Trivia.LeadingKeyword.Range
 
                     error (Error(FSComp.SR.tcAndBangNotSupported (), andBangRange))
 
                 if ceenv.isQuery then
                     error (Error(FSComp.SR.tcBindMayNotBeUsedInQueries (), mBind))
 
                 let sources =
-                    (letRhsExpr
-                     :: [ for SynExprAndBang(body = andExpr) in andBangBindings -> andExpr ])
+                    (letRhsExpr :: [ for SynBinding(expr = andExpr) in andBangBindings -> andExpr ])
                     |> List.map (fun expr -> mkSourceExprConditional isFromSource expr ceenv.sourceMethInfo ceenv.builderValName)
 
                 let pats =
-                    letPat :: [ for SynExprAndBang(pat = andPat) in andBangBindings -> andPat ]
+                    letPat :: [ for SynBinding(headPat = andPat) in andBangBindings -> andPat ]
 
                 let sourcesRange = sources |> List.map (fun e -> e.Range) |> List.reduce unionRanges
 

src/Compiler/Driver/GraphChecking/FileContentMapping.fs

@@ -507,14 +507,14 @@ let visitSynExpr (e: SynExpr) : FileContentEntry list =
         | SynExpr.YieldOrReturnFrom(expr = expr) -> visit expr continuation
         | SynExpr.LetOrUseBang(pat = pat; rhs = rhs; andBangs = andBangs; body = body) ->
             let continuations =
-                let andBangExprs = List.map (fun (SynExprAndBang(body = body)) -> body) andBangs
+                let andBangExprs = List.map (fun (SynBinding(expr = body)) -> body) andBangs
                 List.map visit (body :: rhs :: andBangExprs)
 
             let finalContinuation nodes =
                 [
                     yield! List.concat nodes
                     yield! visitPat pat
-                    for SynExprAndBang(pat = pat) in andBangs do
+                    for SynBinding(headPat = pat) in andBangs do
                         yield! visitPat pat
                 ]
                 |> continuation

src/Compiler/Service/FSharpParseFileResults.fs

@@ -766,7 +766,7 @@ type FSharpParseFileResults(diagnostics: FSharpDiagnostic[], input: ParsedInput,
                             yield! walkBindSeqPt spBind
                             yield! walkExpr true rhsExpr
 
-                            for SynExprAndBang(debugPoint = andBangSpBind; body = eAndBang) in andBangs do
+                            for SynBinding(debugPoint = andBangSpBind; expr = eAndBang) in andBangs do
                                 yield! walkBindSeqPt andBangSpBind
                                 yield! walkExpr true eAndBang
 

src/Compiler/Service/ServiceInterfaceStubGenerator.fs

@@ -959,7 +959,7 @@ module InterfaceStubGenerator =
                 | SynExpr.LetOrUseBang(rhs = synExpr1; andBangs = synExprAndBangs; body = synExpr2) ->
                     [
                         yield synExpr1
-                        for SynExprAndBang(body = eAndBang) in synExprAndBangs do
+                        for SynBinding(expr = eAndBang) in synExprAndBangs do
                             yield eAndBang
                         yield synExpr2
                     ]

src/Compiler/Service/ServiceParseTreeWalk.fs

@@ -751,7 +751,7 @@ module SyntaxTraversal =
                         yield dive synExpr synExpr.Range traverseSynExpr
                         yield!
                             [
-                                for SynExprAndBang(pat = andBangSynPat; body = andBangSynExpr) in andBangSynExprs do
+                                for SynBinding(headPat = andBangSynPat; expr = andBangSynExpr) in andBangSynExprs do
                                     yield (dive andBangSynPat andBangSynPat.Range traversePat)
                                     yield (dive andBangSynExpr andBangSynExpr.Range traverseSynExpr)
                             ]

src/Compiler/Service/ServiceParsedInputOps.fs

@@ -851,7 +851,7 @@ module ParsedInput =
             | SynExpr.LetOrUseBang(rhs = e1; andBangs = es; body = e2) ->
                 [
                     yield e1
-                    for SynExprAndBang(body = eAndBang) in es do
+                    for SynBinding(expr = eAndBang) in es do
                         yield eAndBang
                     yield e2
                 ]
@@ -2159,7 +2159,7 @@ module ParsedInput =
                 walkPat pat
                 walkExpr e1
 
-                for SynExprAndBang(pat = patAndBang; body = eAndBang) in es do
+                for SynBinding(headPat = patAndBang; expr = eAndBang) in es do
                     walkPat patAndBang
                     walkExpr eAndBang
 

src/Compiler/Service/ServiceStructure.fs

@@ -262,7 +262,7 @@ module Structure =
                 let exprs =
                     [
                         eLet
-                        for SynExprAndBang(body = eAndBang) in es do
+                        for SynBinding(expr = eAndBang) in es do
                             eAndBang
                     ]
 

src/Compiler/SyntaxTree/ParseHelpers.fs

@@ -871,15 +871,28 @@ let mkClassMemberLocalBindings
 let mkAndBang (mKeyword: range, pat: SynPat, rhs: SynExpr, mWhole: range, mEquals: range, mIn: range option) =
     let spBind = DebugPointAtBinding.Yes(unionRanges mKeyword rhs.Range)
 
-    let trivia: SynExprAndBangTrivia =
+    let trivia: SynBindingTrivia =
         {
-            AndBangKeyword = mKeyword
-            EqualsRange = mEquals
-            InKeyword = mIn
+            LeadingKeyword = SynLeadingKeyword.And mKeyword
+            InlineKeyword = mIn
+            EqualsRange = Some mEquals
         }
 
-    // For and!, isUse is always true, isFromSource is always true
-    SynExprAndBang(spBind, false, true, pat, rhs, mWhole, trivia)
+    SynBinding(
+        accessibility = None,
+        kind = SynBindingKind.Normal,
+        isInline = false,
+        isMutable = false,
+        attributes = [],
+        xmlDoc = PreXmlDoc.Empty,
+        valData = SynInfo.emptySynValData,
+        headPat = pat,
+        returnInfo = None,
+        expr = rhs,
+        range = mWhole,
+        debugPoint = spBind,
+        trivia = trivia
+    )
 
 let mkDefnBindings (mWhole, BindingSetPreAttrs(_, isRec, isUse, declsPreAttrs, _bindingSetRange), attrs, vis, attrsm) =
     if isUse then
@@ -1063,7 +1076,7 @@ let mkLetExpression
         mWhole: range,
         body: SynExpr,
         bindingInfo: (bool * BindingSet) option,
-        bangInfo: (SynPat * SynExpr * SynExprAndBang list * range option * bool) option
+        bangInfo: (SynPat * SynExpr * SynBinding list * range option * bool) option
     ) =
     if isBang then
         match bangInfo with

src/Compiler/SyntaxTree/ParseHelpers.fsi

@@ -205,11 +205,11 @@ val mkLetExpression:
     mWhole: range *
     body: SynExpr *
     bindingInfo: (bool * BindingSet) option *
-    bangInfo: (SynPat * SynExpr * SynExprAndBang list * range option * bool) option ->
+    bangInfo: (SynPat * SynExpr * SynBinding list * range option * bool) option ->
         SynExpr
 
 val mkAndBang:
-    mKeyword: range * pat: SynPat * rhs: SynExpr * mWhole: range * mEquals: range * mIn: range option -> SynExprAndBang
+    mKeyword: range * pat: SynPat * rhs: SynExpr * mWhole: range * mEquals: range * mIn: range option -> SynBinding
 
 val mkDefnBindings:
     mWhole: range * BindingSet * attrs: SynAttributes * vis: SynAccess option * attrsm: range -> SynModuleDecl list

src/Compiler/SyntaxTree/SyntaxTree.fs

@@ -627,8 +627,6 @@ type SynExpr =
         typeArgsRange: range *
         range: range
 
-    | LetOrUse of isRecursive: bool * isUse: bool * bindings: SynBinding list * body: SynExpr * range: range * trivia: SynExprLetOrUseTrivia
-
     | TryWith of
         tryExpr: SynExpr *
         withCases: SynMatchClause list *
@@ -720,13 +718,15 @@ type SynExpr =
 
     | YieldOrReturnFrom of flags: (bool * bool) * expr: SynExpr * range: range * trivia: SynExprYieldOrReturnFromTrivia
 
+    | LetOrUse of isRecursive: bool * isUse: bool * bindings: SynBinding list * body: SynExpr * range: range * trivia: SynExprLetOrUseTrivia
+
     | LetOrUseBang of
         bindDebugPoint: DebugPointAtBinding *
         isUse: bool *
         isFromSource: bool *
         pat: SynPat *
         rhs: SynExpr *
-        andBangs: SynExprAndBang list *
+        andBangs: SynBinding list *
         body: SynExpr *
         range: range *
         trivia: SynExprLetOrUseTrivia
@@ -871,25 +871,6 @@ type SynExpr =
         | SynExpr.ArbitraryAfterError _ -> true
         | _ -> false
 
-[<NoEquality; NoComparison>]
-type SynExprAndBang =
-    | SynExprAndBang of
-        debugPoint: DebugPointAtBinding *
-        isUse: bool *
-        isFromSource: bool *
-        pat: SynPat *
-        body: SynExpr *
-        range: range *
-        trivia: SynExprAndBangTrivia
-
-    member x.Range =
-        match x with
-        | SynExprAndBang(range = range) -> range
-
-    member this.Trivia =
-        match this with
-        | SynExprAndBang(trivia = trivia) -> trivia
-
 [<NoEquality; NoComparison>]
 type SynExprRecordField =
     | SynExprRecordField of
@@ -1126,6 +1107,8 @@ type SynBinding =
 
     member x.RangeOfHeadPattern = let (SynBinding(headPat = headPat)) = x in headPat.Range
 
+    member x.Trivia = let (SynBinding(trivia = trivia)) = x in trivia
+
 [<NoEquality; NoComparison>]
 type SynBindingReturnInfo =
     | SynBindingReturnInfo of typeName: SynType * range: range * attributes: SynAttributes * trivia: SynBindingReturnInfoTrivia

src/Compiler/SyntaxTree/SyntaxTree.fsi

@@ -726,18 +726,6 @@ type SynExpr =
         typeArgsRange: range *
         range: range
 
-    /// F# syntax: let pat = expr in expr
-    /// F# syntax: let f pat1 .. patN = expr in expr
-    /// F# syntax: let rec f pat1 .. patN = expr in expr
-    /// F# syntax: use pat = expr in expr
-    | LetOrUse of
-        isRecursive: bool *
-        isUse: bool *
-        bindings: SynBinding list *
-        body: SynExpr *
-        range: range *
-        trivia: SynExprLetOrUseTrivia
-
     /// F# syntax: try expr with pat -> expr
     | TryWith of
         tryExpr: SynExpr *
@@ -886,6 +874,18 @@ type SynExpr =
     /// Computation expressions only
     | YieldOrReturnFrom of flags: (bool * bool) * expr: SynExpr * range: range * trivia: SynExprYieldOrReturnFromTrivia
 
+    /// F# syntax: let pat = expr in expr
+    /// F# syntax: let f pat1 .. patN = expr in expr
+    /// F# syntax: let rec f pat1 .. patN = expr in expr
+    /// F# syntax: use pat = expr in expr
+    | LetOrUse of
+        isRecursive: bool *
+        isUse: bool *
+        bindings: SynBinding list *
+        body: SynExpr *
+        range: range *
+        trivia: SynExprLetOrUseTrivia
+
     /// F# syntax: let! pat = expr in expr
     /// F# syntax: use! pat = expr in expr
     /// F# syntax: let! pat = expr and! ... and! ... and! pat = expr in expr
@@ -896,7 +896,7 @@ type SynExpr =
         isFromSource: bool *
         pat: SynPat *
         rhs: SynExpr *
-        andBangs: SynExprAndBang list *
+        andBangs: SynBinding list *
         body: SynExpr *
         range: range *
         trivia: SynExprLetOrUseTrivia
@@ -976,23 +976,6 @@ type SynExpr =
     /// Indicates if this expression arises from error recovery
     member IsArbExprAndThusAlreadyReportedError: bool
 
-[<NoEquality; NoComparison>]
-type SynExprAndBang =
-    | SynExprAndBang of
-        debugPoint: DebugPointAtBinding *
-        isUse: bool *
-        isFromSource: bool *
-        pat: SynPat *
-        body: SynExpr *
-        range: range *
-        trivia: SynExprAndBangTrivia
-
-    /// Gets the syntax range of this construct
-    member Range: range
-
-    /// Gets the trivia associated with this construct
-    member Trivia: SynExprAndBangTrivia
-
 [<NoEquality; NoComparison>]
 type SynExprRecordField =
     | SynExprRecordField of
@@ -1254,6 +1237,8 @@ type SynBinding =
 
     member RangeOfHeadPattern: range
 
+    member Trivia: SynBindingTrivia
+
 /// Represents the return information in a binding for a 'let' or 'member' declaration
 [<NoEquality; NoComparison>]
 type SynBindingReturnInfo =

src/Compiler/SyntaxTree/SyntaxTreeOps.fs

@@ -985,7 +985,7 @@ let rec synExprContainsError inpExpr =
             walkExpr e1
             || walkExprs
                 [
-                    for SynExprAndBang(body = e) in es do
+                    for SynBinding(expr = e) in es do
                         yield e
                 ]
             || walkExpr e2

src/Compiler/SyntaxTree/SyntaxTrivia.fs

@@ -292,14 +292,6 @@ type SynBindingTrivia =
             EqualsRange = None
         }
 
-[<NoEquality; NoComparison>]
-type SynExprAndBangTrivia =
-    {
-        AndBangKeyword: range
-        EqualsRange: range
-        InKeyword: range option
-    }
-
 [<NoEquality; NoComparison>]
 type SynModuleDeclNestedModuleTrivia =
     {

src/Compiler/SyntaxTree/SyntaxTrivia.fsi

@@ -349,18 +349,6 @@ type SynBindingTrivia =
 
     static member Zero: SynBindingTrivia
 
-/// Represents additional information for SynExprAndBang
-[<NoEquality; NoComparison>]
-type SynExprAndBangTrivia =
-    {
-        /// The syntax range of the `and!` keyword
-        AndBangKeyword: range
-        /// The syntax range of the `=` token.
-        EqualsRange: range
-        /// The syntax range of the `in` keyword.
-        InKeyword: range option
-    }
-
 /// Represents additional information for SynModuleDecl.NestedModule
 [<NoEquality; NoComparison>]
 type SynModuleDeclNestedModuleTrivia =