Make then optional at line end
#7276
Merged
Conversation
This file contains hidden or 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
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Sep 20, 2019
Also auto-indent after `if ...` as long as it doesn't match `if ... then ...` in anticipation of scala#7276 Also use lazy matching (`.*?` instead of `.*`) when possible to avoid backtracking explosion.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Sep 20, 2019
- do not auto-indent after end marker (fixes scala#7274) - auto-indent after `if ...` as long as it doesn't match `if ... then ...` in anticipation of scala#7276 - use lazy matching (`.*?` instead of `.*`) when possible to avoid backtracking explosion.
odersky
force-pushed
the
change-then-opt
branch
4 times, most recently
from
d431149 to
d834abe
Compare
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Sep 23, 2019
- do not auto-indent after end marker (fixes scala#7274) - auto-indent after `if ...` as long as it doesn't match `if ... then ...` in anticipation of scala#7276 - use lazy matching (`.*?` instead of `.*`) when possible to avoid backtracking explosion.
`then` is treated like `;`: It is inferred at the end of a line, if
- a new line would otherwise be inferred
- the next line is indented
Disambiguation with Scala-2 syntax is as follows:
The question is whether to classify
if (A) B
C
as a condition A followed by a statement B (old-style), or
as a condition (A) B followed by a then part C, and an inferred
`then` in-between (new-style)
(new-style) is chosen if B cannot start a statement, or starts with a leading
infix operator. Otherwise put, (new-style) is chosen if in
```
(A)
B
```
no newline would be inserted. (old-style) is chosen otherwise.
This means that some otherwise legal conditions still need a `then` at the end of a line.
If (old-style) is eventually deprecated and removed, we can drop this restriction.
`do` can start an expression or a statement only under -language:Scala2. Maintaining this distinction is important in order not to insert spurious newlines in front of `do` in a `while` or `for`.
Issue "too far to the right" errors also at toplevel. Previously this was done only inside braces.
- Update current reference docs to what's implemented in 0.19. - Add links to new pages describing what will come in 0.20.
odersky
force-pushed
the
change-then-opt
branch
from
d834abe to
912c672
Compare
|
test performance please |
|
performance test scheduled: 6 job(s) in queue, 1 running. |
|
Performance test finished successfully: Visit http://dotty-bench.epfl.ch/7276/ to see the changes. Benchmarks is based on merging with master (0d34bfb) |
nafg
reviewed
Sep 24, 2019
| title: New Control Syntax | ||
| --- | ||
|
|
||
| Scala 3 has a new "quiet" syntax for control expressions that does not rely in |
liufengyun
approved these changes
Sep 25, 2019
| newLineOpt() | ||
| val newSyntax = toBeContinued(altToken) | ||
| if newSyntax then | ||
| t = inSepRegion(LBRACE, RBRACE) { | ||
| expr1Rest(postfixExprRest(simpleExprRest(t)), Location.ElseWhere) | ||
| } |
There was a problem hiding this comment.
nitpick: the name newSyntax is not informative nor accurate.
Yes, and that's as specified. |
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.
No description provided.