-
Notifications
You must be signed in to change notification settings - Fork 223
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.
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
Fix object names as unary operators #2105
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgodzik
reviewed
Jul 30, 2020
scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala
Outdated
Show resolved
Hide resolved
scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala
Show resolved
Hide resolved
scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala
Outdated
Show resolved
Hide resolved
kpbochenek
force-pushed
the
fix-minus-object-name
branch
3 times, most recently
from
July 30, 2020 15:39
e2a626d
to
a7e9837
Compare
kitbellew
reviewed
Jul 30, 2020
scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala
Outdated
Show resolved
Hide resolved
scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala
Outdated
Show resolved
Hide resolved
kpbochenek
force-pushed
the
fix-minus-object-name
branch
from
August 3, 2020 07:22
a7e9837
to
57532ab
Compare
tgodzik
approved these changes
Aug 3, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
kitbellew
approved these changes
Aug 3, 2020
kitbellew
reviewed
Aug 3, 2020
else | ||
atPos(op, auto)(Term.ApplyUnary(op, simpleExpr(allowRepeated = true))) | ||
else { | ||
simpleExpr0(allowRepeated = true) match { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we hadn't had to build it for 2.11, fold
would have been ideal here, although our usage is also equivalent to .map(...).getOrElse(...)
.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2095
When we encounter token looking like 'unary operator' we always parse it this way.
But as in example in #2095 it can be also an ident(name of object/class etc).
Instead of throwing exception when we cannot parse it as unary operator we can try and assume '-' is ident and parse it this way.