Parser: Update OBLOCKSEP token passing

Author: edgarfgp

src/Compiler/Checking/CheckRecordSyntaxHelpers.fs

@@ -91,13 +91,14 @@ let TransformAstForNestedUpdates (cenv: TcFileState) (env: TcEnv) overallTy (lid
             withStartEnd origId.idRange.End id.idRange.Start origId.idRange
 
         match withExpr with
-        | SynExpr.Ident origId, (blockSep: BlockSeparator) ->
+        | SynExpr.Ident origId, Some(blockSep: BlockSeparator) ->
             let lid, rng = upToId blockSep.Range id (origId :: ids)
-
-            Some(
-                SynExpr.LongIdent(false, LongIdentWithDots(lid, rng), None, totalRange origId id),
-                BlockSeparator.Offside(blockSep.Range, None)
-            )
+            Some(SynExpr.LongIdent(false, LongIdentWithDots(lid, rng), None, totalRange origId id), Some blockSep)
+        | SynExpr.Ident origId, None ->
+            // Synthesize a zero-width separator range at the end of the identifier when missing
+            let zero = origId.idRange.EndRange
+            let lid, rng = upToId zero id (origId :: ids)
+            Some(SynExpr.LongIdent(false, LongIdentWithDots(lid, rng), None, totalRange origId id), None)
         | _ -> None
 
     let rec synExprRecd copyInfo (outerFieldId: Ident) innerFields exprBeingAssigned =
@@ -120,7 +121,13 @@ let TransformAstForNestedUpdates (cenv: TcFileState) (env: TcEnv) overallTy (lid
                                AnonRecdTypeInfo.TupInfo = TupInfo.Const isStruct
                            }) ->
                 let fields = [ LongIdentWithDots([ fieldId ], []), None, nestedField ]
-                SynExpr.AnonRecd(isStruct, copyInfo outerFieldId, fields, outerFieldId.idRange, { OpeningBraceRange = range0 })
+                // Pass through optional separator for anonymous records
+                let copyInfoAnon =
+                    match copyInfo outerFieldId with
+                    | Some(exprWhenWith, sepOpt) -> Some(exprWhenWith, sepOpt)
+                    | None -> None
+
+                SynExpr.AnonRecd(isStruct, copyInfoAnon, fields, outerFieldId.idRange, { OpeningBraceRange = range0 })
             | _ ->
                 let fields =
                     [
@@ -153,11 +160,11 @@ let TransformAstForNestedUpdates (cenv: TcFileState) (env: TcEnv) overallTy (lid
 
 /// When the original expression in copy-and-update is more complex than `{ x with ... }`, like `{ f () with ... }`,
 /// we bind it first, so that it's not evaluated multiple times during a nested update
-let BindOriginalRecdExpr (withExpr: SynExpr * BlockSeparator) mkRecdExpr =
-    let originalExpr, blockSep = withExpr
+let BindOriginalRecdExpr (withExpr: SynExpr * BlockSeparator option) mkRecdExpr =
+    let originalExpr, blockSepOpt = withExpr
     let mOrigExprSynth = originalExpr.Range.MakeSynthetic()
     let id = mkSynId mOrigExprSynth "bind@"
-    let withExpr = SynExpr.Ident id, blockSep
+    let withExpr = SynExpr.Ident id, blockSepOpt
 
     let binding =
         mkSynBinding

src/Compiler/Checking/CheckRecordSyntaxHelpers.fsi

@@ -16,8 +16,10 @@ val TransformAstForNestedUpdates:
     overallTy: TType ->
     lid: LongIdent ->
     exprBeingAssigned: SynExpr ->
-    withExpr: SynExpr * BlockSeparator ->
+    withExpr: SynExpr * BlockSeparator option ->
         (Ident list * Ident) * SynExpr option
 
 val BindOriginalRecdExpr:
-    withExpr: SynExpr * BlockSeparator -> mkRecdExpr: ((SynExpr * BlockSeparator) option -> SynExpr) -> SynExpr
+    withExpr: SynExpr * BlockSeparator option ->
+        mkRecdExpr: ((SynExpr * BlockSeparator option) option -> SynExpr) ->
+            SynExpr

src/Compiler/Checking/Expressions/CheckExpressions.fs

@@ -5898,7 +5898,8 @@ and TcExprUndelayed (cenv: cenv) (overallTy: OverallTy) env tpenv (synExpr: SynE
                 TcAnonRecdExpr cenv overallTy env tpenv (isStruct, withExprOpt, unsortedFieldExprs, mWholeExpr)
             )
         | Some withExpr ->
-            BindOriginalRecdExpr withExpr (fun withExpr -> SynExpr.AnonRecd (isStruct, withExpr, unsortedFieldExprs, mWholeExpr, trivia))
+            BindOriginalRecdExpr withExpr (fun withExprOpt ->
+                SynExpr.AnonRecd (isStruct, withExprOpt, unsortedFieldExprs, mWholeExpr, trivia))
             |> TcExpr cenv overallTy env tpenv
 
     | SynExpr.ArrayOrList (isArray, args, m) ->
@@ -7907,7 +7908,7 @@ and TcNewAnonRecdExpr cenv (overallTy: TType) env tpenv (isStruct, unsortedField
 
     mkAnonRecd g mWholeExpr anonInfo unsortedFieldIds unsortedCheckedArgs unsortedFieldTys, tpenv
 
-and TcCopyAndUpdateAnonRecdExpr cenv (overallTy: TType) env tpenv (isStruct, (origExpr, blockSeparator), unsortedFieldIdsAndSynExprsGiven, mWholeExpr) =
+and TcCopyAndUpdateAnonRecdExpr cenv (overallTy: TType) env tpenv (isStruct, (origExpr, blockSeparatorOpt), unsortedFieldIdsAndSynExprsGiven, mWholeExpr) =
     // The fairly complex case '{| origExpr with X = 1; Y = 2 |}'
     // The origExpr may be either a record or anonymous record.
     // The origExpr may be either a struct or not.
@@ -7933,7 +7934,7 @@ and TcCopyAndUpdateAnonRecdExpr cenv (overallTy: TType) env tpenv (isStruct, (or
             match synLongIdent.LongIdent with
             | [] -> error(Error(FSComp.SR.nrUnexpectedEmptyLongId(), mWholeExpr))
             | [ id ] -> ([], id), Some exprBeingAssigned
-            | lid -> TransformAstForNestedUpdates cenv env origExprTy lid exprBeingAssigned (origExpr, blockSeparator))
+            | lid -> TransformAstForNestedUpdates cenv env origExprTy lid exprBeingAssigned (origExpr, blockSeparatorOpt))
         |> GroupUpdatesToNestedFields
 
     let unsortedFieldSynExprsGiven = unsortedFieldIdsAndSynExprsGiven |> List.choose snd

src/Compiler/Service/ServiceParseTreeWalk.fs

@@ -445,7 +445,7 @@ module SyntaxTraversal =
                 | SynExpr.AnonRecd(copyInfo = copyOpt; recordFields = fields) ->
                     [
                         match copyOpt with
-                        | Some(expr, blockSep) ->
+                        | Some(expr, Some blockSep) ->
                             yield dive expr expr.Range traverseSynExpr
 
                             yield
@@ -456,6 +456,9 @@ module SyntaxTraversal =
                                         visitor.VisitRecordField(path, Some expr, None)
                                     else
                                         None)
+                        | Some(expr, None) ->
+                            // No explicit separator (implicit OBLOCKSEP). Still dive into expr.
+                            yield dive expr expr.Range traverseSynExpr
                         | _ -> ()
 
                         for field, _, x in fields do
@@ -466,19 +469,11 @@ module SyntaxTraversal =
 
                 | SynExpr.Record(baseInfo = inheritOpt; copyInfo = copyOpt; recordFields = fields) ->
                     [
-                        let diveIntoSeparator offsideColumn scPosOpt copyOpt =
-                            match scPosOpt with
-                            | Some scPos ->
-                                if posGeq pos scPos then
-                                    visitor.VisitRecordField(path, copyOpt, None) // empty field after the inherits
-                                else
-                                    None
-                            | None ->
-                                //semicolon position is not available - use offside rule
-                                if pos.Column = offsideColumn then
-                                    visitor.VisitRecordField(path, copyOpt, None) // empty field after the inherits
-                                else
-                                    None
+                        let diveIntoSeparator scPos copyOpt =
+                            if posGeq pos scPos then
+                                visitor.VisitRecordField(path, copyOpt, None) // empty field after the inherits
+                            else
+                                None
 
                         match inheritOpt with
                         | Some(_ty, expr, _range, sepOpt, inheritRange) ->
@@ -505,12 +500,12 @@ module SyntaxTraversal =
                                         // inherit A()
                                         // $
                                         // field1 = 5
-                                        diveIntoSeparator inheritRange.StartColumn blockSep.Position None)
+                                        diveIntoSeparator blockSep.Position None)
                             | None -> ()
                         | _ -> ()
 
                         match copyOpt with
-                        | Some(expr, blockSep) ->
+                        | Some(expr, Some blockSep) ->
                             yield dive expr expr.Range traverseSynExpr
 
                             yield
@@ -521,6 +516,9 @@ module SyntaxTraversal =
                                         visitor.VisitRecordField(path, Some expr, None)
                                     else
                                         None)
+                        | Some(expr, None) ->
+                            // No explicit separator (implicit OBLOCKSEP). Still dive into expr.
+                            yield dive expr expr.Range traverseSynExpr
                         | _ -> ()
 
                         let copyOpt = Option.map fst copyOpt
@@ -563,7 +561,7 @@ module SyntaxTraversal =
                                         // field1 = 5
                                         // $
                                         // field2 = 5
-                                        diveIntoSeparator offsideColumn blockSep.Position copyOpt)
+                                        diveIntoSeparator blockSep.Position copyOpt)
                             | _ -> ()
 
                     ]

src/Compiler/SyntaxTree/SyntaxTree.fs

@@ -308,21 +308,18 @@ type SeqExprOnly = SeqExprOnly of bool
 
 [<NoEquality; NoComparison; RequireQualifiedAccess>]
 type BlockSeparator =
-    | Semicolon of range: range * position: pos option
-    | Comma of range: range * position: pos option
-    | Offside of range: range * position: pos option
+    | Semicolon of range: range * position: pos
+    | Comma of range: range * position: pos
 
     member this.Range =
         match this with
         | Semicolon(range = m)
-        | Comma(range = m)
-        | Offside(range = m) -> m
+        | Comma(range = m) -> m
 
     member this.Position =
         match this with
-        | Semicolon(position = p)
-        | Comma(position = p)
-        | Offside(position = p) -> p
+        | Semicolon(position = p) -> p
+        | Comma(position = p) -> p
 
 type RecordFieldName = SynLongIdent * bool
 
@@ -549,7 +546,7 @@ type SynExpr =
 
     | AnonRecd of
         isStruct: bool *
-        copyInfo: (SynExpr * BlockSeparator) option *
+        copyInfo: (SynExpr * BlockSeparator option) option *
         recordFields: (SynLongIdent * range option * SynExpr) list *
         range: range *
         trivia: SynExprAnonRecdTrivia
@@ -558,7 +555,7 @@ type SynExpr =
 
     | Record of
         baseInfo: (SynType * SynExpr * range * BlockSeparator option * range) option *
-        copyInfo: (SynExpr * BlockSeparator) option *
+        copyInfo: (SynExpr * BlockSeparator option) option *
         recordFields: SynExprRecordField list *
         range: range
 

src/Compiler/SyntaxTree/SyntaxTree.fsi

@@ -359,21 +359,16 @@ type SeqExprOnly =
 type BlockSeparator =
     /// A separator consisting of a semicolon ';'
     /// range is the range of the semicolon
-    /// position is the position of the semicolon (if available)
-    | Semicolon of range: range * position: pos option
+    /// position is the position of the semicolon
+    | Semicolon of range: range * position: pos
     /// A separator consisting of a comma ','
     /// range is the range of the comma
-    /// position is the position of the comma (if available)
-    | Comma of range: range * position: pos option
-
-    // A separator consisting of a newline
-    /// range is the range of the newline
-    /// position is the position of the newline (if available)
-    | Offside of range: range * position: pos option
+    /// position is the position of the comma
+    | Comma of range: range * position: pos
 
     member Range: range
 
-    member Position: pos option
+    member Position: pos
 
 /// Represents a record field name plus a flag indicating if given record field name is syntactically
 /// correct and can be used in name resolution.
@@ -607,7 +602,7 @@ type SynExpr =
     /// F# syntax: struct {| id1=e1; ...; idN=eN |}
     | AnonRecd of
         isStruct: bool *
-        copyInfo: (SynExpr * BlockSeparator) option *
+        copyInfo: (SynExpr * BlockSeparator option) option *
         recordFields: (SynLongIdent * range option * SynExpr) list *
         range: range *
         trivia: SynExprAnonRecdTrivia
@@ -621,7 +616,7 @@ type SynExpr =
     /// every field includes range of separator after the field (for tooling)
     | Record of
         baseInfo: (SynType * SynExpr * range * BlockSeparator option * range) option *
-        copyInfo: (SynExpr * BlockSeparator) option *
+        copyInfo: (SynExpr * BlockSeparator option) option *
         recordFields: SynExprRecordField list *
         range: range
 

src/Compiler/pars.fsy

@@ -3668,14 +3668,13 @@ namePatPairs:
      { let (id: Ident), mEq, (pat: SynPat) = $1
        let m = unionRanges id.idRange pat.Range
        let lid = SynLongIdent([id], [], [None])
-       NamePatPairField(lid, mEq, m, pat, Some $2) :: $3 }
+       NamePatPairField(lid, mEq, m, pat, $2) :: $3 }
 
    | namePatPair seps_block seps_block namePatPairs
-      { reportParseErrorAt (rhs parseState 3) (FSComp.SR.parsExpectingPattern ())
-        let (id: Ident), mEq, (pat: SynPat) = $1
+      { let (id: Ident), mEq, (pat: SynPat) = $1
         let m = unionRanges id.idRange pat.Range
         let lid = SynLongIdent([id], [], [None])
-        NamePatPairField(lid, mEq, m, pat, Some $2) :: $4 }
+        NamePatPairField(lid, mEq, m, pat, $2) :: $4 }
 
 namePatPair:
    | ident EQUALS parenPattern
@@ -4016,13 +4015,13 @@ recordPatternElementsAux:
   | recordPatternElement seps_block recordPatternElementsAux
       { let (lid: SynLongIdent), mEq, (pat: SynPat) = $1
         let m = unionRanges lid.Range pat.Range
-        NamePatPairField(lid, mEq, m, pat, Some $2) :: $3 }
+        NamePatPairField(lid, mEq, m, pat, $2) :: $3 }
 
   | recordPatternElement seps_block seps_block recordPatternElementsAux
       { reportParseErrorAt (rhs parseState 3) (FSComp.SR.parsExpectingPattern ())
         let (lid: SynLongIdent), mEq, (pat: SynPat) = $1
         let m = unionRanges lid.Range pat.Range
-        NamePatPairField(lid, mEq, m, pat, Some $2) :: $4 }
+        NamePatPairField(lid, mEq, m, pat, $2) :: $4 }
 
 recordPatternElement:
   | path EQUALS parenPattern
@@ -5709,7 +5708,7 @@ recdExprCore:
   | appExpr
     { let mExpr = rhs parseState 1
       reportParseErrorAt mExpr (FSComp.SR.parsFieldBinding ())
-      Some($1, BlockSeparator.Offside(mExpr.EndRange, None)), [] }
+      (Some($1, None), []) }
 
 /*
     handles cases when identifier can start from the underscore
@@ -5743,36 +5742,40 @@ recdExprCore:
   | appExpr WITH recdBinding recdExprBindings opt_seps_block
      { let l = List.rev $4
        let l = rebindRanges $3 l $5
-       (Some($1, BlockSeparator.Offside(rhs parseState 2, None)), l) }
+       (Some($1, $5), l) }
 
   | appExpr OWITH opt_seps_block OEND
-     { (Some($1, BlockSeparator.Offside(rhs parseState 2, None)), []) }
+     { (Some($1, $3), []) }
 
   | appExpr OWITH recdBinding recdExprBindings opt_seps_block OEND
      { let l = List.rev $4
        let l = rebindRanges $3 l $5
-       (Some($1, BlockSeparator.Offside(rhs parseState 2, None)), l) }
+       (Some($1, $5), l) }
 
 opt_seps_block:
   | seps_block
-     { Some $1 }
+     { $1 }
 
   | /* EMPTY */
      { None }
 
 seps_block:
   | OBLOCKSEP
-     { BlockSeparator.Offside((rhs parseState 1), None) }
+     { 
+       // OBLOCKSEP is purely syntactic: do not produce a BlockSeparator value
+       // Treat it as absence of an explicit separator
+       None
+     }
 
   | SEMICOLON
      { let m = (rhs parseState 1)
-       BlockSeparator.Semicolon(m, Some m.End) }
+       Some (BlockSeparator.Semicolon(m, m.End)) }
 
   | SEMICOLON OBLOCKSEP
-     { BlockSeparator.Semicolon((rhs2 parseState 1 2), Some (rhs parseState 1).End) }
+     { Some (BlockSeparator.Semicolon((rhs2 parseState 1 2), (rhs parseState 1).End)) }
 
   | OBLOCKSEP SEMICOLON
-     { BlockSeparator.Semicolon((rhs2 parseState 1 2), Some (rhs parseState 2).End) }
+     { Some (BlockSeparator.Semicolon((rhs2 parseState 1 2), (rhs parseState 2).End)) }
 
 
 /* identifier can start from the underscore */
@@ -5787,7 +5790,7 @@ pathOrUnderscore :
 
 recdExprBindings:
   | recdExprBindings seps_block recdBinding
-     { ($3, Some $2) :: $1 }
+     { ($3, $2) :: $1 }
 
   | /* EMPTY */
      { [] }