Skip to content

Parser: Update OBLOCKSEP token passing #18921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
edgarfgp wants to merge 20 commits into from
Closed

Parser: Update OBLOCKSEP token passing #18921

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9f9c0ec
Parser: Update OBLOCKSEP token passing
edgarfgp Sep 19, 2025
8347ba2
baselines
edgarfgp Sep 19, 2025
3e1a3c7
Reduce diff
edgarfgp Sep 19, 2025
02d2984
Merge branch 'main' into capture-block-separators
edgarfgp Sep 19, 2025
9139f3e
Reduce diff
edgarfgp Sep 19, 2025
489cf4f
Merge branch 'capture-block-separators' of github.com:edgarfgp/fsharp…
edgarfgp Sep 20, 2025
74db5c8
reduce diff
edgarfgp Sep 20, 2025
fcc7b41
Remove position from BlockSeparator
edgarfgp Sep 20, 2025
ae13b59
Use a more accurate separator range
edgarfgp Sep 20, 2025
c9be8b7
Use nested match
edgarfgp Sep 20, 2025
fb776ab
extracting common logic in diveIntoRecordLikeExpr
edgarfgp Sep 20, 2025
8828dad
Fix editor test
edgarfgp Sep 20, 2025
aa7bd57
fix test: Disallow completion before with keyword
edgarfgp Sep 21, 2025
04d0c5b
Update pars.fsy
edgarfgp Sep 23, 2025
ffdaa6e
rollback the behavior to pre-#18899
edgarfgp Sep 23, 2025
7d89c7b
Merge branch 'main' into capture-block-separators
edgarfgp Sep 24, 2025
37b3cf1
Avoid capturing {x with} as separator
edgarfgp Sep 24, 2025
d138a23
Merge branch 'capture-block-separators' of github.com:edgarfgp/fsharp…
edgarfgp Sep 24, 2025
1ff5bed
capture with keyword using trivia
edgarfgp Sep 25, 2025
53809e7
format
edgarfgp Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Compiler/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5744,15 +5744,15 @@ recdExprCore:
| appExpr WITH recdBinding recdExprBindings opt_seps_block
{ let l = List.rev $4
let l = rebindRanges $3 l $5
(Some($1, $5), l) }
(Some($1, None), l) }
Copy link
Member

@auduchinok auduchinok Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The captured info is still different here.

Copy link
Contributor Author

@edgarfgp edgarfgp Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. this should be None as previously was BlockSeparator.Offside


| appExpr OWITH opt_seps_block OEND
{ (Some($1, $3), []) }
{ (Some($1, None), []) }

| appExpr OWITH recdBinding recdExprBindings opt_seps_block OEND
{ let l = List.rev $4
let l = rebindRanges $3 l $5
(Some($1, $5), l) }
(Some($1, None), l) }

opt_seps_block:
| seps_block
Expand Down
Loading