Skip to content

Commit 3b95dad

Browse files
committed
reduce diff
1 parent 95f5778 commit 3b95dad

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

src/Compiler/Checking/CheckRecordSyntaxHelpers.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ let TransformAstForNestedUpdates
108108

109109
match withExpr with
110110
| SynExpr.Ident origId, (blockSep: BlockSeparator) ->
111-
let sepRange = blockSep.Range
112-
let lid, rng = upToId sepRange id (origId :: ids)
111+
let lid, rng = upToId blockSep.Range id (origId :: ids)
113112
// We need a neutral, “offside” separator for the AST that does not claim there was a concrete token like a semicolon or a comma
114113
Some(
115114
SynExpr.LongIdent(false, LongIdentWithDots(lid, rng), None, totalRange origId id),

src/Compiler/Service/ServiceParseTreeWalk.fs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -448,11 +448,9 @@ module SyntaxTraversal =
448448
| Some(expr, blockSep) ->
449449
yield dive expr expr.Range traverseSynExpr
450450

451-
let withRange = blockSep.Range
452-
453451
yield
454-
dive () withRange (fun () ->
455-
if posGeq pos withRange.End then
452+
dive () blockSep.Range (fun () ->
453+
if posGeq pos blockSep.Range.End then
456454
// special case: caret is after WITH
457455
// { x with $ }
458456
visitor.VisitRecordField(path, Some expr, None)
@@ -518,11 +516,9 @@ module SyntaxTraversal =
518516
| Some(expr, blockSep) ->
519517
yield dive expr expr.Range traverseSynExpr
520518

521-
let withRange = blockSep.Range
522-
523519
yield
524-
dive () withRange (fun () ->
525-
if posGeq pos withRange.End then
520+
dive () blockSep.Range (fun () ->
521+
if posGeq pos blockSep.Range.End then
526522
// special case: caret is after WITH
527523
// { x with $ }
528524
visitor.VisitRecordField(path, Some expr, None)
@@ -564,16 +560,14 @@ module SyntaxTraversal =
564560

565561
match sepOpt with
566562
| Some sep ->
567-
let scPosOpt = sep.Position
568-
let sepRange = sep.Range
569563

570564
yield
571-
dive () sepRange (fun () ->
565+
dive () sep.Range (fun () ->
572566
// special case: caret is between field bindings
573567
// field1 = 5
574568
// $
575569
// field2 = 5
576-
diveIntoSeparator offsideColumn scPosOpt copyOpt)
570+
diveIntoSeparator offsideColumn sep.Position copyOpt)
577571
| _ -> ()
578572

579573
]

0 commit comments

Comments
 (0)