Merge pull request #9257 from adpi2/develop

smarter · web-flow · commit 8a4c442acd67 · 2020-07-02T18:07:37.000+02:00
Improve explain message when token expected
diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala
@@ -1112,7 +1112,7 @@ object messages {
     def explain =
       if (Tokens.isIdentifier(expected) && Tokens.isKeyword(found))
         s"""
-         |If you want to use $foundText as identifier, you may put it in backticks: `$foundText`.""".stripMargin
+         |If you want to use $foundText as identifier, you may put it in backticks: `${Tokens.tokenString(found)}`.""".stripMargin
       else
         ""
   }

Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ object messages {`
`1112`	`1112`	`def explain =`
`1113`	`1113`	`if (Tokens.isIdentifier(expected) && Tokens.isKeyword(found))`
`1114`	`1114`	`s"""`
`1115`		- \|If you want to use $foundText as identifier, you may put it in backticks: `$foundText`.""".stripMargin
	`1115`	+ \|If you want to use $foundText as identifier, you may put it in backticks: `${Tokens.tokenString(found)}`.""".stripMargin
`1116`	`1116`	`else`
`1117`	`1117`	`""`
`1118`	`1118`	`}`