Misleading line number in match parse error

[TmLev]

Describe the bug

Attempt to format match expression with comma results in parsing error with misleading line number in error message.

To Reproduce

MRE:

x = 1

match x:
    case 1 | 2:
        print("1 or 2")
    case _:
        print("Not 1 or 2")

match x, x + 1:
    case 1, 2:
        print("1 and 2")

Format command:

black --target-version py310 example.py

The resulting error is:

error: cannot format example.py: Cannot parse: 3:6: match x:
Oh no! 💥 💔 💥
1 file failed to reformat.

And no errors are appearing if the last match expression is removed:

x = 1

match x:
    case 1 | 2:
        print("1 or 2")
    case _:
        print("Not 1 or 2")

... OR x, x + 1 and 1, 2 are replaced with (x, x + 1) and (1, 2):

x = 1

match x:
    case 1 | 2:
        print("1 or 2")
    case _:
        print("Not 1 or 2")

match (x, x + 1):
    case (1, 2):
        print("1 and 2")

Expected behavior

No errors (?).

Environment

• Black's version: black, 21.11b1 (compiled: no)
• OS and Python version: Mac OS 11.4, Python 3.10.0

[isidentical]

Seems similar to #2637 and #2648, can you check the same example with the latest black installed from main? (this should allow parsing multiple values, for the error reporting, I guess that is still in progress)

[TmLev]

Yeah, everything works with the version from main.
Closing as duplicate?

[isidentical]

Yep both the syntax and the error messages (thanks to @JelleZijlstra on #2649) seem to be fixed now.

[TmLev]

Okay, thanks.
Waiting for a new release.