Skip to content

Commit

Permalink
Backport "Fix trailing comma Ident's span" to 3.5.2 (#21492)
Browse files Browse the repository at this point in the history
Backports #20445 to the 3.5.2 branch.

PR submitted by the release tooling.
[skip ci]
  • Loading branch information
WojciechMazur authored Aug 28, 2024
2 parents ebb0256 + cd0103b commit a31d658
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 1 deletion.
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/parsing/Scanners.scala
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,10 @@ object Scanners {
&& currentRegion.commasExpected
&& (token == RPAREN || token == RBRACKET || token == RBRACE || token == OUTDENT)
then
() /* skip the trailing comma */
// encountered a trailing comma
// reset only the lastOffset
// so that the tree's span is correct
lastOffset = prev.lastOffset
else
reset()
case END =>
Expand Down
36 changes: 36 additions & 0 deletions tests/neg/i16872.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
-- [E006] Not Found Error: tests/neg/i16872.scala:8:6 ------------------------------------------------------------------
8 | aa, // error
| ^^
| Not found: aa
|
| longer explanation available when compiling with `-explain`
-- [E006] Not Found Error: tests/neg/i16872.scala:9:6 ------------------------------------------------------------------
9 | bb, // error
| ^^
| Not found: bb
|
| longer explanation available when compiling with `-explain`
-- [E006] Not Found Error: tests/neg/i16872.scala:10:6 -----------------------------------------------------------------
10 | cc, // error
| ^^
| Not found: cc
|
| longer explanation available when compiling with `-explain`
-- [E006] Not Found Error: tests/neg/i16872.scala:16:6 -----------------------------------------------------------------
16 | dd, // error
| ^^
| Not found: dd
|
| longer explanation available when compiling with `-explain`
-- [E006] Not Found Error: tests/neg/i16872.scala:17:6 -----------------------------------------------------------------
17 | ee, // error
| ^^
| Not found: ee - did you mean eq? or perhaps ne?
|
| longer explanation available when compiling with `-explain`
-- [E006] Not Found Error: tests/neg/i16872.scala:18:6 -----------------------------------------------------------------
18 | ff, // error
| ^^
| Not found: ff
|
| longer explanation available when compiling with `-explain`
19 changes: 19 additions & 0 deletions tests/neg/i16872.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Using a checkfile to verify where the carets point to.
// Originally they were pointing to "cc," and "ff,"
// including the trailing comma

class Test:
def t1 =
(
aa, // error
bb, // error
cc, // error
)

def meth(a: Int, b: Int, c: Int) = a + b + c
def t2 =
meth(
dd, // error
ee, // error
ff, // error
)

0 comments on commit a31d658

Please sign in to comment.