@@ -242,23 +242,17 @@ object Scanners {
242
242
/** A buffer for comments */
243
243
private val commentBuf = CharBuffer ()
244
244
245
- private def handleMigration (keyword : Token ): Token =
246
- if scala3keywords.contains(keyword) && migrateTo3 then treatAsIdent()
247
- else keyword
248
-
249
- private def treatAsIdent (): Token =
250
- report.errorOrMigrationWarning(
251
- i " $name is now a keyword, write ` $name` instead of $name to keep it as an identifier " ,
252
- sourcePos())
253
- patch(source, Span (offset), " `" )
254
- patch(source, Span (offset + name.length), " `" )
255
- IDENTIFIER
256
-
257
- def toToken (name : SimpleName ): Token = {
258
- val idx = name.start
245
+ def toToken (identifier : SimpleName ): Token =
246
+ def handleMigration (keyword : Token ): Token =
247
+ if scala3keywords.contains(keyword) && migrateTo3 then
248
+ report.errorOrMigrationWarning(i " $identifier is now a keyword, write ` $identifier` instead of $identifier to keep it as an identifier " , sourcePos())
249
+ patch(source, Span (offset), " `" )
250
+ patch(source, Span (offset + identifier.length), " `" )
251
+ IDENTIFIER
252
+ else keyword
253
+ val idx = identifier.start
259
254
if (idx >= 0 && idx <= lastKeywordStart) handleMigration(kwArray(idx))
260
255
else IDENTIFIER
261
- }
262
256
263
257
def newTokenData : TokenData = new TokenData {}
264
258
0 commit comments