Skip to content

Update -Yindent-colons functionality #11752

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 14 commits into from
Mar 24, 2021
Merged

Update -Yindent-colons functionality #11752

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1d07c11
Accept more `:` at EOLs under -Yindent-colon
odersky Mar 15, 2021
20d2e2a
Disallow `:` after return
odersky Mar 15, 2021
cd01d25
Replace -Yindent-colons with language import
odersky Mar 18, 2021
e80a192
Drop -Yindent-colons in CB
odersky Mar 18, 2021
53928a9
Use isArrow utility method in Parser
odersky Mar 18, 2021
2093b93
Generalize TokenData#isOperator
odersky Mar 18, 2021
dbfde1c
Add closure arguments, first version
odersky Mar 18, 2021
a57134e
Enable closure arguments only under fewerBracesEnabled
odersky Mar 18, 2021
db19cfd
Allow to retract to new column if next token is `:`
odersky Mar 19, 2021
0bd9739
Disallow `:` after infix operators
odersky Mar 19, 2021
e5fd587
Improve error recovery after illegal `:`
odersky Mar 19, 2021
0c57527
More tests
odersky Mar 19, 2021
8cd6337
Augment returns test
odersky Mar 19, 2021
9fd873c
Revert "Disallow `:` after infix operators"
odersky Mar 19, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Generalize TokenData#isOperator
  • Loading branch information
@odersky
odersky committed Mar 18, 2021
commit 2093b939e599b6c128609f974096a45033026e78
8 changes: 4 additions & 4 deletions compiler/src/dotty/tools/dotc/parsing/Scanners.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ object Scanners {
def isAfterLineEnd: Boolean = lineOffset >= 0

def isOperator =
token == IDENTIFIER && isOperatorPart(name(name.length - 1))
token == BACKQUOTED_IDENT
|| token == IDENTIFIER && isOperatorPart(name(name.length - 1))

def isArrow =
token == ARROW || token == CTXARROW
Expand Down Expand Up @@ -370,8 +371,7 @@ object Scanners {
*/
def isLeadingInfixOperator(inConditional: Boolean = true) =
allowLeadingInfixOperators
&& ( token == BACKQUOTED_IDENT
|| token == IDENTIFIER && isOperatorPart(name(name.length - 1)))
&& isOperator
&& (isWhitespace(ch) || ch == LF)
&& !pastBlankLine
&& {
Expand All @@ -389,7 +389,7 @@ object Scanners {
// leading infix operator.
def assumeStartsExpr(lexeme: TokenData) =
canStartExprTokens.contains(lexeme.token)
&& (token != BACKQUOTED_IDENT || !lexeme.isOperator || nme.raw.isUnary(lexeme.name))
&& (!lexeme.isOperator || nme.raw.isUnary(lexeme.name))
val lookahead = LookaheadScanner()
lookahead.allowLeadingInfixOperators = false
// force a NEWLINE a after current token if it is on its own line
Expand Down