Skip to content

Correct range of struct SynExpr.AnonRecd. #14715

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 1 commit into from
Feb 8, 2023
Merged

Correct range of struct SynExpr.AnonRecd. #14715

Show file tree
Hide file tree
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
25 changes: 18 additions & 7 deletions src/Compiler/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4904,10 +4904,11 @@ objExprInterface:

braceBarExpr:
| STRUCT braceBarExprCore
{ $2 true }
{ let mStruct = rhs parseState 1
$2 (Some mStruct) }

| braceBarExprCore
{ $1 false }
{ $1 None }

braceBarExprCore:
| LBRACE_BAR recdExprCore bar_rbrace
Expand All @@ -4918,7 +4919,9 @@ braceBarExprCore:
| SynExprRecordField((SynLongIdent([id], _, _), _), mEquals, None, _) -> Some (id, mEquals, arbExpr("anonField", id.idRange))
| _ -> reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsInvalidAnonRecdType()); None)
let m = rhs2 parseState 1 3
(fun isStruct -> SynExpr.AnonRecd (isStruct, orig, flds, m)) }
(fun (mStruct: range option) ->
let m = match mStruct with | None -> m | Some mStruct -> unionRanges mStruct m
SynExpr.AnonRecd (mStruct.IsSome, orig, flds, m)) }

| LBRACE_BAR recdExprCore recover
{ reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnmatchedBraceBar())
Expand All @@ -4929,21 +4932,29 @@ braceBarExprCore:
| SynExprRecordField((SynLongIdent([id], _, _), _), mEquals, None, _) -> Some (id, mEquals, arbExpr("anonField", id.idRange))
| _ -> reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsInvalidAnonRecdType()); None)
let m = rhs2 parseState 1 2
(fun isStruct -> SynExpr.AnonRecd (isStruct, orig, flds, m)) }
(fun (mStruct: range option) ->
let m = match mStruct with | None -> m | Some mStruct -> unionRanges mStruct m
SynExpr.AnonRecd (mStruct.IsSome, orig, flds, m)) }

| LBRACE_BAR error bar_rbrace
{ // silent recovery
let m = rhs2 parseState 1 3
(fun _ -> arbExpr("braceBarExpr", m)) }
(fun (mStruct: range option) ->
let m = match mStruct with | None -> m | Some mStruct -> unionRanges mStruct m
arbExpr("braceBarExpr", m)) }

| LBRACE_BAR recover
{ reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnmatchedBraceBar())
let m = rhs2 parseState 1 1
(fun isStruct -> SynExpr.AnonRecd (isStruct, None, [], m)) }
(fun (mStruct: range option) ->
let m = match mStruct with | None -> m | Some mStruct -> unionRanges mStruct m
SynExpr.AnonRecd (mStruct.IsSome, None, [], m)) }

| LBRACE_BAR bar_rbrace
{ let m = rhs2 parseState 1 2
(fun isStruct -> SynExpr.AnonRecd (isStruct, None, [], m)) }
(fun (mStruct: range option) ->
let m = match mStruct with | None -> m | Some mStruct -> unionRanges mStruct m
SynExpr.AnonRecd (mStruct.IsSome, None, [], m)) }

anonLambdaExpr:
| FUN atomicPatterns RARROW typedSequentialExprBlock
Expand Down
22 changes: 22 additions & 0 deletions tests/service/SyntaxTreeTests/ExpressionTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,3 +494,25 @@ type CFoo() =
assertRange (7,4) (7, 67) m
| _ -> Assert.Fail $"Could not get valid AST, got {ast}"

[<Test>]
let ``SynExpr.AnonRecd with struct keyword`` () =
let ast =
getParseResults """
struct
{| Foo =
// meh
someValue |}

struct {| |}
"""

match ast with
| ParsedInput.ImplFile(ParsedImplFileInput(contents = [
SynModuleOrNamespace.SynModuleOrNamespace(decls = [
SynModuleDecl.Expr(expr = SynExpr.AnonRecd(range = m1))
SynModuleDecl.Expr(expr = SynExpr.AnonRecd(range = m2))
])
])) ->
assertRange (2,0) (5, 16) m1
assertRange (7, 0) (7, 12) m2
| _ -> Assert.Fail $"Could not get valid AST, got {ast}"