Skip to content

Syntax tree: include modifiers to binding ranges #9541

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

Merged
TIHan merged 1 commit into from
Jun 24, 2020
Merged

Syntax tree: include modifiers to binding ranges #9541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/fsharp/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2702,7 +2702,7 @@ localBinding:
let mRhs = expr.Range
let optReturnType = $4
let bindingBuilder, mBindLhs = $3
let localBindingRange = unionRanges (rhs2 parseState 3 5) mRhs
let localBindingRange = unionRanges (rhs2 parseState 1 5) mRhs
let localBindingBuilder =
(fun attrs vis mLetKwd ->
let mWhole = unionRanges mLetKwd mRhs
Expand All @@ -2711,7 +2711,7 @@ localBinding:
localBindingRange, localBindingBuilder }

| opt_inline opt_mutable bindingPattern opt_topReturnTypeWithTypeConstraints EQUALS error
{ let mWhole = rhs2 parseState 3 5
{ let mWhole = rhs2 parseState 1 5
let mRhs = rhs parseState 5
let optReturnType = $4
let bindingBuilder, mBindLhs = $3
Expand All @@ -2726,7 +2726,7 @@ localBinding:
| opt_inline opt_mutable bindingPattern opt_topReturnTypeWithTypeConstraints recover
{ if not $5 then reportParseErrorAt (rhs parseState 5) (FSComp.SR.parsUnexpectedEndOfFileDefinition())
let optReturnType = $4
let mWhole = match optReturnType with None -> rhs parseState 3 | Some _ -> rhs2 parseState 3 4
let mWhole = rhs2 parseState 1 (match optReturnType with None -> 3 | _ -> 4)
let mRhs = mWhole.EndRange // zero-width range at end of last good token
let bindingBuilder, mBindLhs = $3
let localBindingBuilder =
Expand Down