Skip to content

Parser: recover unfinished match clause at eof #14167

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
merged 2 commits into from
Oct 26, 2022
Merged

Parser: recover unfinished match clause at eof #14167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
870b18f
Parser: recover unfinished match clause at eof
auduchinok Oct 24, 2022
42a246e
Update test
auduchinok Oct 24, 2022
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 @@ -4083,22 +4083,22 @@ patternClauses:
fun _mBar ->
(SynMatchClause(pat, guard, arbExpr ("patternClauses1", m.EndRange), m, DebugPointAtTarget.Yes, SynMatchClauseTrivia.Zero) :: clauses), mLast }

| patternAndGuard patternResult BAR error
| patternAndGuard patternResult BAR recover
{ let pat, guard = $1
let mArrow, resultExpr = $2
let mLast = rhs parseState 3
let m = unionRanges resultExpr.Range pat.Range
fun mBar ->
[SynMatchClause(pat, guard, resultExpr, m, DebugPointAtTarget.Yes, { ArrowRange = Some mArrow; BarRange = mBar })], mLast }

| patternAndGuard patternResult error
| patternAndGuard patternResult recover
{ let pat, guard = $1
let mArrow, resultExpr = $2
let m = unionRanges resultExpr.Range pat.Range
fun mBar ->
[SynMatchClause(pat, guard, resultExpr, m, DebugPointAtTarget.Yes, { ArrowRange = Some mArrow; BarRange = mBar })], m }

| patternAndGuard error
| patternAndGuard recover
{ let pat, guard = $1
let patm = pat.Range
let m = guard |> Option.map (fun e -> unionRanges patm e.Range) |> Option.defaultValue patm
Expand Down
13 changes: 13 additions & 0 deletions tests/service/ParserTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,16 @@ let (1,1,1) = ()
[ p12; p13; p21; p23; p31; p32; p43; p51; p62 ] |> List.iter assertIsEmptyRange

| _ -> failwith "Unexpected tree"


[<Test>]
let ``Match - Clause 01`` () =
let parseResults = getParseResults """
match () with
| _ -> ()
| _,
"""
let exprs = getSingleExprInModule parseResults
match exprs with
| SynExpr.Match(_, _, [_; _], _, _) -> ()
| _ -> failwith "Unexpected tree"