Skip to content

Commit 49d0467

Browse files
committed
Fix hover for statements, where alias detection is too eager, fixes #534
1 parent 12dc67c commit 49d0467

3 files changed

Lines changed: 28 additions & 2 deletions

File tree

‎crates/zuban_python/src/file/flow_analysis.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use crate::{
4646
},
4747
type_helpers::{
4848
Callable, Class, ClassLookupOptions, FirstParamKind, Function, InstanceLookupOptions,
49-
LookupDetails, OverloadResult, OverloadedFunction,
49+
OverloadResult, OverloadedFunction,
5050
},
5151
utils::{EitherIterator, debug_indent},
5252
};

‎crates/zuban_python/src/file/type_computation/alias.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ impl<'db, 'file> NameResolution<'db, 'file, '_> {
6969

7070
fn documentation_for_lookup(&self, lookup: Lookup<'file, 'file>) -> Option<TypeDocs<'file>> {
7171
match lookup {
72-
Lookup::T(TypeContent::TypeAlias(alias)) => Some(TypeDocs::TypeAlias(alias)),
72+
Lookup::T(TypeContent::TypeAlias(alias))
73+
if alias.is_valid() && !alias.type_if_valid().is_any() =>
74+
{
75+
Some(TypeDocs::TypeAlias(alias))
76+
}
7377
Lookup::T(TypeContent::Class { node_ref, .. }) => {
7478
Some(TypeDocs::SimpleClassTypeAlias(node_ref))
7579
}

‎crates/zuban_python/tests/mypylike/tests/documentation.test‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,3 +1329,25 @@ f()
13291329
[out]
13301330
__main__:5: error: Missing positional argument "x" in call to "f"
13311331
__main__.py:5:documentation -> "```python\nAny\n```"
1332+
1333+
[case docs_for_non_alias]
1334+
# From GH #534
1335+
class Node:
1336+
pass
1337+
1338+
queue = [Node()]
1339+
#? --codepoint-column 0 documentation
1340+
n = queue[0]
1341+
1342+
#? --codepoint-column 0 documentation
1343+
Y = 1
1344+
#? --codepoint-column 0 documentation
1345+
X = list[Y] # E: Variable "__main__.Y" is not valid as a type \
1346+
# N: See https://mypy.readthedocs.io/en/stable/common_issues.html#variables-vs-type-aliases
1347+
1348+
x: X
1349+
1350+
[out]
1351+
__main__.py:7:documentation -> "```python\n(variable) n: Node\n```"
1352+
__main__.py:10:documentation -> "```python\n(variable) Y: int\n```"
1353+
__main__.py:12:documentation -> "```python\n(type alias) X = list[Any]\n```"

0 commit comments

Comments
 (0)