Add line # of previous definition (resubmit #3396) #3424
Conversation
|
In case the context is |
mypy/semanal.py
Outdated
| if original_ctx.node and original_ctx.node.get_line() != -1: | ||
| extra_msg = ' on line {}'.format(original_ctx.node.get_line()) | ||
| else: | ||
| extra_msg = ' (line unavailable; possibly an import)' |
There was a problem hiding this comment.
We could simplify the message a bit. What about just (possibly by an import). The 'line unavailable' part doesn't provide useful information really.
test-data/unit/semanal-errors.test
Outdated
| class A: | ||
| pass | ||
| [out] | ||
| main:2: error: Name 'A' already defined (line unavailable; possibly an import) |
There was a problem hiding this comment.
Here are further ideas for test cases:
- Original definition is a decorated function.
- Original definition is an overloaded function.
- Original definition is a named tuple definition.
- Original definition is a typed dict definition.
- Original definition is a module (
import m).
There was a problem hiding this comment.
If a module is simply imported twice, there's no error message. Did you mean some other test?
There was a problem hiding this comment.
@pkch Maybe Jukka means something like this:
import re
re = 1There was a problem hiding this comment.
Yes, but that will cause a completely different error message (types are not compatible). It won't get to the point of complaining about duplicate definition.
There was a problem hiding this comment.
And what about
import re
import math
re = mathThere was a problem hiding this comment.
In this case, there's no error message at all (as expected?).
test-data/unit/semanal-errors.test
Outdated
| class A: | ||
| pass | ||
| [out] | ||
| main:2: error: Name 'A' already defined (possibly by an import) |
There was a problem hiding this comment.
Can you use # E: ... comments in these cases instead?
test-data/unit/semanal-errors.test
Outdated
|
|
||
| [out] | ||
| main:4: error: Name 'Point' already defined on line 2 | ||
|
|
There was a problem hiding this comment.
Remove extra empty lines at the end of file.
test-data/unit/semanal-errors.test
Outdated
| [builtins fixtures/dict.pyi] | ||
|
|
||
| [out] | ||
| main:4: error: Name 'Point' already defined on line 2 |
There was a problem hiding this comment.
Suggestions for additional test cases:
import mfollowed bydef m(): ...T = TypeVar('T')followed byclass T: ...- Ignored import (
import m # type: ignoreorfrom m import f # type: ignore) followed by definition. - Type alias like
A = List[int]followed by a redefinition.
test-data/unit/semanal-errors.test
Outdated
| pass | ||
| [out] | ||
| main:12: error: Name 'f' already defined on line 3 | ||
|
|
There was a problem hiding this comment.
Remove second empty line (here and below).
|
This may be ready to merge (the last CR fixes was only to add more tests, no code changes). |
Partial fix for #1874: improve the error message. The duplicate definitions in different if/else branches are still not allowed (this is much harder to fix).
This is a resubmission of #3396 which caused the crash in #3415 and was reverted. The old PR is in commit 39c3058; after that, I added 2 more commits: the failing test that repros the crash, and the fix to it.