Skip to content

Fix #8731: Revise end markers scheme #8747

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

Jump to bottom
Merged
merged 7 commits into from
Apr 22, 2020
Merged

Fix #8731: Revise end markers scheme #8747

merged 7 commits into from
Apr 22, 2020

Conversation

odersky
Copy link
Contributor

@odersky odersky commented Apr 19, 2020

Handle end markers in parser instead of in Scanner, adding end markers
to the context free syntax.

odersky added 2 commits April 19, 2020 15:34
@odersky
Tweaks
3292ed8 
 - Use Eql derivation in Namer
 - Use end markers in Nullables
 - Fix a link in overview doc
@odersky
Fix scala#8731: Revise end markers scheme
bdf18e9 
Handle end markers in parser instead of in Scanner, adding end markers
to the context free syntax.
odersky added 5 commits April 19, 2020 16:30
@odersky
Fixes
25b1148 
 - recognize end markers after toplevel package objects
 - don't let newline insertion be confused by endmarker tokens
@odersky
Adapt doc page to new scheme
7f4c828
@odersky
Improve docs
8062c41
@odersky
More docs on endmarkers
97112c2
@odersky
Fix indentation width in example from 4 to 2
d7900c5
@odersky odersky requested a review from liufengyun April 22, 2020 09:37
@odersky odersky added this to the 0.24.0-RC1 milestone Apr 22, 2020
liufengyun
liufengyun approved these changes Apr 22, 2020
View reviewed changes
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

docs/docs/reference/other-new-features/indentation.md

```
EndMarker ::= ‘end’ EndMarkerTag -- when followed by EOL
EndMarkerTag ::= id | ‘if’ | ‘while’ | ‘for’ | ‘match’ | ‘try’
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The try seems to be a display problem, it looks fine when we render the page separately.

@liufengyun liufengyun merged commit c986fdd into scala:master Apr 22, 2020
@liufengyun liufengyun deleted the fix-#8731 branch April 22, 2020 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liufengyun liufengyun liufengyun approved these changes

Assignees

@liufengyun liufengyun

Labels
None yet
Projects
None yet
Milestone
0.24.0-RC1
Development

Successfully merging this pull request may close these issues.
2 participants
@odersky @liufengyun