Skip to content

Commit 08f5814

Browse files
committed
Avoid shadowing of name 'name'
1 parent 13250bc commit 08f5814

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -242,23 +242,17 @@ object Scanners {
242242
/** A buffer for comments */
243243
private val commentBuf = CharBuffer()
244244

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
259254
if (idx >= 0 && idx <= lastKeywordStart) handleMigration(kwArray(idx))
260255
else IDENTIFIER
261-
}
262256

263257
def newTokenData: TokenData = new TokenData {}
264258

0 commit comments

Comments
 (0)