Skip to content

Add and keyword range to read-write property. #12608

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
Jan 18, 2022
Merged

Add and keyword range to read-write property. #12608

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
9 changes: 5 additions & 4 deletions src/fsharp/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,9 +1751,10 @@ classDefnMemberGetSet:
/* The "get, set" part of a member definition */
classDefnMemberGetSetElements:
| classDefnMemberGetSetElement
{ [$1] }
{ [$1], None }
| classDefnMemberGetSetElement AND classDefnMemberGetSetElement
{ [$1;$3] }
{ let mAnd = rhs parseState 2
[$1;$3], Some mAnd }

classDefnMemberGetSetElement:
| opt_inline opt_attributes bindingPattern opt_topReturnTypeWithTypeConstraints EQUALS typedSequentialExprBlock
Expand All @@ -1780,7 +1781,7 @@ memberCore:

/* Properties with explicit get/set, also indexer properties */
| opt_inline bindingPattern opt_topReturnTypeWithTypeConstraints classDefnMemberGetSet
{ let mWith, classDefnMemberGetSetElements = $4
{ let mWith, (classDefnMemberGetSetElements, mAnd) = $4
let mWhole = (rhs parseState 2, classDefnMemberGetSetElements) ||> unionRangeWithListBy (fun (_, _, _, _, _, _, m2) -> m2)
let propertyNameBindingBuilder, _ = $2
let optPropertyType = $3
Expand Down Expand Up @@ -1969,7 +1970,7 @@ memberCore:
// Iterate over 1 or 2 'get'/'set' entries
match classDefnMemberGetSetElements with
| [ h ] -> List.choose id [ tryMkSynMemberDefnMember (Some (PropertyKeyword.With mWith)) h ]
| [ g ; s ] -> List.choose id [ tryMkSynMemberDefnMember (Some (PropertyKeyword.With mWith)) g ; tryMkSynMemberDefnMember None s ]
| [ g ; s ] -> List.choose id [ tryMkSynMemberDefnMember (Some (PropertyKeyword.With mWith)) g ; tryMkSynMemberDefnMember (Option.map PropertyKeyword.And mAnd) s ]
| _ -> [])
}

Expand Down
3 changes: 2 additions & 1 deletion tests/service/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,11 @@ type Foo() =
typeDefns = [ SynTypeDefn(typeRepr =
SynTypeDefnRepr.ObjectModel(members=[ _
SynMemberDefn.Member(memberDefn=SynBinding(headPat=SynPat.LongIdent(propertyKeyword=Some(PropertyKeyword.With mWith))))
SynMemberDefn.Member _ ])
SynMemberDefn.Member(memberDefn=SynBinding(headPat=SynPat.LongIdent(propertyKeyword=Some(PropertyKeyword.And mAnd)))) ])
) ])
]) ])) ->
assertRange (5, 8) (5, 12) mWith
assertRange (6, 8) (6, 11) mAnd
| _ -> Assert.Fail "Could not get valid AST"

module SyntaxExpressions =
Expand Down