Merge pull request #4501 from benkobalog/fix-#4500

allanrenucci · web-flow · commit 1d24eaaeff84 · 2018-08-28T17:12:47.000+02:00
Fix #4500 Allow keyword start after numbers
diff --git a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala
@@ -54,7 +54,7 @@ object SyntaxHighlighting {
     @forceInline def keywordStart =
       prev == 0    || prev == ' ' || prev == '{' || prev == '(' ||
       prev == '\n' || prev == '[' || prev == ',' || prev == ':' ||
-      prev == '|'  || prev == '&'
+      prev == '|'  || prev == '&' || prev.isDigit
 
     @forceInline def numberStart(c: Char) =
       c.isDigit && (!prev.isLetter || prev == '.' || prev == ' ' || prev == '(' || prev == '\u0000')
diff --git a/compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala b/compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala
@@ -64,6 +64,7 @@ class SyntaxHighlightingTests {
   @Test
   def expressions = {
     test("val x = 1 + 2 + 3", "<K|val> <V|x> = <L|1> + <L|2> + <L|3>")
+    test("if (true) 3 else 1", "<K|if> (<K|true>) <L|3> <K|else> <L|1>")
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ class SyntaxHighlightingTests {`
`64`	`64`	`@Test`
`65`	`65`	`def expressions = {`
`66`	`66`	`test("val x = 1 + 2 + 3", "<K\|val> <V\|x> = <L\|1> + <L\|2> + <L\|3>")`
	`67`	`+ test("if (true) 3 else 1", "<K\|if> (<K\|true>) <L\|3> <K\|else> <L\|1>")`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`@Test`