Skip to content

Commit d1ec140

Browse files
committed
Fix highlighting tokens after newline predated by '='
1 parent 0f91408 commit d1ec140

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/dotty/tools/dotc/repl/SyntaxHighlighter.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ object SyntaxHighlighting {
3838
'q' :: 'r' :: 's' :: 't' :: 'u' :: 'v' :: 'w' :: 'x' :: 'y' :: 'z' :: Nil
3939

4040
private val typeEnders =
41-
'{' :: '}' :: ')' :: '(' :: '=' :: ' ' :: ',' :: '.' :: Nil
41+
'{' :: '}' :: ')' :: '(' :: '=' :: ' ' :: ',' :: '.' :: '\n' :: Nil
4242

4343
def apply(chars: Iterable[Char]): Vector[Char] = {
4444
var prev: Char = 0
4545
var remaining = chars.toStream
4646
val newBuf = new StringBuilder
4747

4848
@inline def keywordStart =
49-
prev == 0 || prev == ' ' || prev == '{' || prev == '('
49+
prev == 0 || prev == ' ' || prev == '{' || prev == '(' || prev == '\n'
5050

5151
@inline def numberStart(c: Char) =
5252
c.isDigit && (!prev.isLetter || prev == '.' || prev == ' ' || prev == '(' || prev == '\u0000')
@@ -224,7 +224,7 @@ object SyntaxHighlighting {
224224
def append(c: Char, shouldHL: String => Boolean, highlight: String => String) = {
225225
var curr: Char = 0
226226
val sb = new StringBuilder(s"$c")
227-
while (remaining.nonEmpty && curr != ' ' && curr != '(') {
227+
while (remaining.nonEmpty && curr != ' ' && curr != '(' && curr != '\n') {
228228
curr = takeChar()
229229
if (curr != ' ') sb += curr
230230
}

src/dotty/tools/dotc/repl/ammonite/filters/BasicFilters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object BasicFilters {
2121
exitFilter,
2222
enterFilter,
2323
clearFilter,
24-
loggingFilter,
24+
//loggingFilter,
2525
typingFilter
2626
)
2727

0 commit comments

Comments
 (0)