Remove position from BlockSeparator

edgarfgp · edgarfgp · commit fcc7b418b025 · 2025-09-20T15:18:26.000+01:00
diff --git a/src/Compiler/Service/ServiceParseTreeWalk.fs b/src/Compiler/Service/ServiceParseTreeWalk.fs
@@ -500,7 +500,7 @@ module SyntaxTraversal =
                                         // inherit A()
                                         // $
                                         // field1 = 5
-                                        diveIntoSeparator blockSep.Position None)
+                                        diveIntoSeparator blockSep.Range.End None)
                             | None -> ()
                         | _ -> ()
 
@@ -561,7 +561,7 @@ module SyntaxTraversal =
                                         // field1 = 5
                                         // $
                                         // field2 = 5
-                                        diveIntoSeparator blockSep.Position copyOpt)
+                                        diveIntoSeparator blockSep.Range.End copyOpt)
                             | _ -> ()
 
                     ]
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs
@@ -308,19 +308,14 @@ type SeqExprOnly = SeqExprOnly of bool
 
 [<NoEquality; NoComparison; RequireQualifiedAccess>]
 type BlockSeparator =
-    | Semicolon of range: range * position: pos
-    | Comma of range: range * position: pos
+    | Semicolon of range: range
+    | Comma of range: range
 
     member this.Range =
         match this with
         | Semicolon(range = m)
         | Comma(range = m) -> m
 
-    member this.Position =
-        match this with
-        | Semicolon(position = p) -> p
-        | Comma(position = p) -> p
-
 type RecordFieldName = SynLongIdent * bool
 
 type ExprAtomicFlag =
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi
@@ -359,17 +359,13 @@ type SeqExprOnly =
 type BlockSeparator =
     /// A separator consisting of a semicolon ';'
     /// range is the range of the semicolon
-    /// position is the position of the semicolon
-    | Semicolon of range: range * position: pos
+    | Semicolon of range: range
     /// A separator consisting of a comma ','
     /// range is the range of the comma
-    /// position is the position of the comma
-    | Comma of range: range * position: pos
+    | Comma of range: range
 
     member Range: range
 
-    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.
 type RecordFieldName = SynLongIdent * bool
diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy
@@ -5771,13 +5771,13 @@ seps_block:
 
   | SEMICOLON
      { let m = (rhs parseState 1)
-       Some (BlockSeparator.Semicolon(m, m.End)) }
+       Some (BlockSeparator.Semicolon(m)) }
 
   | SEMICOLON OBLOCKSEP
-     { Some (BlockSeparator.Semicolon((rhs2 parseState 1 2), (rhs parseState 1).End)) }
+     { Some (BlockSeparator.Semicolon((rhs2 parseState 1 2))) }
 
   | OBLOCKSEP SEMICOLON
-     { Some (BlockSeparator.Semicolon((rhs2 parseState 1 2), (rhs parseState 2).End)) }
+     { Some (BlockSeparator.Semicolon((rhs2 parseState 1 2))) }
 
 
 /* identifier can start from the underscore */
diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl
@@ -5919,12 +5919,8 @@ FSharp.Compiler.Symbols.FSharpXmlDoc: Int32 GetHashCode(System.Collections.IEqua
 FSharp.Compiler.Symbols.FSharpXmlDoc: Int32 Tag
 FSharp.Compiler.Symbols.FSharpXmlDoc: Int32 get_Tag()
 FSharp.Compiler.Symbols.FSharpXmlDoc: System.String ToString()
-FSharp.Compiler.Syntax.BlockSeparator+Comma: FSharp.Compiler.Text.Position get_position()
-FSharp.Compiler.Syntax.BlockSeparator+Comma: FSharp.Compiler.Text.Position position
 FSharp.Compiler.Syntax.BlockSeparator+Comma: FSharp.Compiler.Text.Range get_range()
 FSharp.Compiler.Syntax.BlockSeparator+Comma: FSharp.Compiler.Text.Range range
-FSharp.Compiler.Syntax.BlockSeparator+Semicolon: FSharp.Compiler.Text.Position get_position()
-FSharp.Compiler.Syntax.BlockSeparator+Semicolon: FSharp.Compiler.Text.Position position
 FSharp.Compiler.Syntax.BlockSeparator+Semicolon: FSharp.Compiler.Text.Range get_range()
 FSharp.Compiler.Syntax.BlockSeparator+Semicolon: FSharp.Compiler.Text.Range range
 FSharp.Compiler.Syntax.BlockSeparator+Tags: Int32 Comma
@@ -5933,13 +5929,11 @@ FSharp.Compiler.Syntax.BlockSeparator: Boolean IsComma
 FSharp.Compiler.Syntax.BlockSeparator: Boolean IsSemicolon
 FSharp.Compiler.Syntax.BlockSeparator: Boolean get_IsComma()
 FSharp.Compiler.Syntax.BlockSeparator: Boolean get_IsSemicolon()
-FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator NewComma(FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Position)
-FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator NewSemicolon(FSharp.Compiler.Text.Range, FSharp.Compiler.Text.Position)
+FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator NewComma(FSharp.Compiler.Text.Range)
+FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator NewSemicolon(FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator+Comma
 FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator+Semicolon
 FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Syntax.BlockSeparator+Tags
-FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Text.Position Position
-FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Text.Position get_Position()
 FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Text.Range Range
 FSharp.Compiler.Syntax.BlockSeparator: FSharp.Compiler.Text.Range get_Range()
 FSharp.Compiler.Syntax.BlockSeparator: Int32 Tag
diff --git a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -14,14 +14,13 @@ ImplFile
                    (LongIdent (SynLongIdent ([Exception], [], [None])),
                     Paren
                       (Ident msg, (2,19--2,20), Some (2,23--2,24), (2,19--2,24)),
-                    (2,10--2,24), Some (Semicolon ((2,24--2,25), (2,25))),
-                    (2,2--2,9)), None,
+                    (2,10--2,24), Some (Semicolon (2,24--2,25)), (2,2--2,9)),
+                 None,
                  [SynExprRecordField
                     ((SynLongIdent ([X], [], [None]), true), Some (2,28--2,29),
                      Some (Const (Int32 1, (2,30--2,31))), (2,26--2,31),
-                     Some (Semicolon ((2,31--2,32), (2,32))))], (2,0--2,34)),
-              (2,0--2,34))], PreXmlDocEmpty, [], None, (2,0--2,34),
-          { LeadingKeyword = None })], (true, true),
-      { ConditionalDirectives = []
-        WarnDirectives = []
-        CodeComments = [] }, set []))
+                     Some (Semicolon (2,31--2,32)))], (2,0--2,34)), (2,0--2,34))],
+          PreXmlDocEmpty, [], None, (2,0--2,34), { LeadingKeyword = None })],
+      (true, true), { ConditionalDirectives = []
+                      WarnDirectives = []
+                      CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 01.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                           ([NamePatPairField
                               (SynLongIdent ([a], [], [None]), Some (4,6--4,7),
                                (4,4--4,9), Wild (4,8--4,9),
-                               Some (Semicolon ((4,9--4,10), (4,10))));
+                               Some (Semicolon (4,9--4,10)));
                             NamePatPairField
                               (SynLongIdent ([b], [], [None]), Some (4,13--4,14),
                                (4,11--4,16), Wild (4,15--4,16), None)],
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 02.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                           ([NamePatPairField
                               (SynLongIdent ([a], [], [None]), Some (4,6--4,7),
                                (4,4--4,9), Wild (4,8--4,9),
-                               Some (Semicolon ((4,9--4,10), (4,10))));
+                               Some (Semicolon (4,9--4,10)));
                             NamePatPairField
                               (SynLongIdent ([b], [], [None]), Some (4,13--4,14),
                                (4,11--4,14),
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 03.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                           ([NamePatPairField
                               (SynLongIdent ([a], [], [None]), Some (4,6--4,7),
                                (4,4--4,9), Wild (4,8--4,9),
-                               Some (Semicolon ((4,9--4,10), (4,10))));
+                               Some (Semicolon (4,9--4,10)));
                             NamePatPairField
                               (SynLongIdent ([b], [], [None]), None,
                                (4,11--4,12),
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 04.fs.bsl
@@ -13,13 +13,13 @@ ImplFile
                           ([NamePatPairField
                               (SynLongIdent ([a], [], [None]), Some (4,6--4,7),
                                (4,4--4,9), Wild (4,8--4,9),
-                               Some (Semicolon ((4,9--4,10), (4,10))))],
-                           (4,4--4,10), { ParenRange = (4,3--4,11) }), None,
-                        (4,2--4,11)), None, Const (Int32 2, (4,15--4,16)),
-                     (4,2--4,16), Yes, { ArrowRange = Some (4,12--4,14)
-                                         BarRange = Some (4,0--4,1) })],
-                 (3,0--4,16), { MatchKeyword = (3,0--3,5)
-                                WithKeyword = (3,8--3,12) }), (3,0--4,16))],
+                               Some (Semicolon (4,9--4,10)))], (4,4--4,10),
+                           { ParenRange = (4,3--4,11) }), None, (4,2--4,11)),
+                     None, Const (Int32 2, (4,15--4,16)), (4,2--4,16), Yes,
+                     { ArrowRange = Some (4,12--4,14)
+                       BarRange = Some (4,0--4,1) })], (3,0--4,16),
+                 { MatchKeyword = (3,0--3,5)
+                   WithKeyword = (3,8--3,12) }), (3,0--4,16))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--4,16), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 05.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                           ([NamePatPairField
                               (SynLongIdent ([a], [], [None]), Some (4,6--4,7),
                                (4,4--4,9), Wild (4,8--4,9),
-                               Some (Semicolon ((4,9--4,10), (4,10))));
+                               Some (Semicolon (4,9--4,10)));
                             NamePatPairField
                               (SynLongIdent ([c], [], [None]), Some (4,15--4,16),
                                (4,13--4,18), Wild (4,17--4,18), None)],
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 06.fs.bsl
@@ -15,13 +15,13 @@ ImplFile
                                (4,4--4,9),
                                Named
                                  (SynIdent (a, None), false, None, (4,8--4,9)),
-                               Some (Semicolon ((4,9--4,10), (4,10))));
+                               Some (Semicolon (4,9--4,10)));
                             NamePatPairField
                               (SynLongIdent ([b], [], [None]), Some (4,13--4,14),
                                (4,11--4,16),
                                Named
                                  (SynIdent (b, None), false, None, (4,15--4,16)),
-                               Some (Semicolon ((4,16--4,17), (4,17))));
+                               Some (Semicolon (4,16--4,17)));
                             NamePatPairField
                               (SynLongIdent ([c], [], [None]), Some (4,20--4,21),
                                (4,18--4,23),
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 07.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 07.fs.bsl
@@ -19,11 +19,11 @@ ImplFile
                               ([Foo; Bar; A], [(4,7--4,8); (4,11--4,12)],
                                [None; None; None]), Some (4,14--4,15),
                             (4,4--4,17), Const (Int32 1, (4,16--4,17)),
-                            Some (Semicolon ((4,17--4,18), (4,18))));
+                            Some (Semicolon (4,17--4,18)));
                          NamePatPairField
                            (SynLongIdent ([B], [], [None]), Some (4,21--4,22),
                             (4,19--4,24), Const (Int32 2, (4,23--4,24)),
-                            Some (Semicolon ((4,24--4,25), (4,25))));
+                            Some (Semicolon (4,24--4,25)));
                          NamePatPairField
                            (SynLongIdent ([C], [], [None]), Some (4,28--4,29),
                             (4,26--4,31), Const (Int32 3, (4,30--4,31)), None)],
diff --git a/tests/service/data/SyntaxTree/Pattern/Named field 08.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Named field 08.fs.bsl
@@ -17,7 +17,7 @@ ImplFile
                        ([NamePatPairField
                            (SynLongIdent ([A], [], [None]), None, (4,4--4,5),
                             FromParseError (Wild (4,5--4,5), (4,5--4,5)),
-                            Some (Semicolon ((4,6--4,7), (4,7))));
+                            Some (Semicolon (4,6--4,7)));
                          NamePatPairField
                            (SynLongIdent ([B], [], [None]), Some (4,10--4,11),
                             (4,8--4,13), Const (Int32 3, (4,12--4,13)), None)],
diff --git a/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 02.fs.bsl
@@ -11,7 +11,7 @@ ImplFile
                        ([NamePatPairField
                            (SynLongIdent ([A], [], [None]), Some (4,6--4,7),
                             (4,4--4,9), Wild (4,8--4,9),
-                            Some (Semicolon ((4,9--4,10), (4,10))));
+                            Some (Semicolon (4,9--4,10)));
                          NamePatPairField
                            (SynLongIdent ([B], [], [None]), Some (4,13--4,14),
                             (4,11--4,16), Wild (4,15--4,16), None)], (4,2--4,18)),
diff --git a/tests/service/data/SyntaxTree/Pattern/Record 07.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Record 07.fs.bsl
@@ -11,11 +11,11 @@ ImplFile
                        ([NamePatPairField
                            (SynLongIdent ([A], [], [None]), Some (4,6--4,7),
                             (4,4--4,9), Const (Int32 1, (4,8--4,9)),
-                            Some (Semicolon ((4,9--4,10), (4,10))));
+                            Some (Semicolon (4,9--4,10)));
                          NamePatPairField
                            (SynLongIdent ([B], [], [None]), Some (4,13--4,14),
                             (4,11--4,16), Const (Int32 2, (4,15--4,16)),
-                            Some (Semicolon ((4,16--4,17), (4,17))));
+                            Some (Semicolon (4,16--4,17)));
                          NamePatPairField
                            (SynLongIdent ([C], [], [None]), Some (4,20--4,21),
                             (4,18--4,23), Const (Int32 3, (4,22--4,23)), None)],
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 03.fs.bsl
@@ -26,7 +26,7 @@ ImplFile
                                         Named
                                           (SynIdent (name, None), false, None,
                                            (4,19--4,23)),
-                                        Some (Semicolon ((4,23--4,24), (4,24))));
+                                        Some (Semicolon (4,23--4,24)));
                                      NamePatPairField
                                        (SynLongIdent ([Age], [], [None]),
                                         Some (4,29--4,30), (4,25--4,34),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 04.fs.bsl
@@ -25,7 +25,7 @@ ImplFile
                                      Named
                                        (SynIdent (name, None), false, None,
                                         (4,18--4,22)),
-                                     Some (Semicolon ((4,22--4,23), (4,23))));
+                                     Some (Semicolon (4,22--4,23)));
                                   NamePatPairField
                                     (SynLongIdent ([Age], [], [None]),
                                      Some (4,28--4,29), (4,24--4,33),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 05.fs.bsl
@@ -26,7 +26,7 @@ ImplFile
                                         Named
                                           (SynIdent (name, None), false, None,
                                            (4,19--4,23)),
-                                        Some (Semicolon ((4,23--4,24), (4,24))));
+                                        Some (Semicolon (4,23--4,24)));
                                      NamePatPairField
                                        (SynLongIdent ([Age], [], [None]),
                                         Some (4,29--4,30), (4,25--4,34),
