MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-22730 Properly render Union and Optional types containing TypeVars

Browse Source 
Namely, don't consider them "unknown" wrapping them in another
weak Union and rendering using PyType#getName() rather than
PyTypeModelBuilder.
This commit is contained in:
Mikhail Golubev
2017-03-06 15:20:44 +03:00
parent 2c79c98d22
commit 05951d275f
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/documentation/PyTypeModelBuilder.java
+1 -1
View File
@@ -266,7 +266,7 @@ public class PyTypeModelBuilder {
}
else if (type instanceof PyUnionType && allowUnions) {
final PyUnionType unionType = (PyUnionType)type;
if (type instanceof PyDynamicallyEvaluatedType || PyTypeChecker.isUnknown(type)) {
if (type instanceof PyDynamicallyEvaluatedType || PyTypeChecker.isUnknown(type, false)) {
result = new UnknownType(build(unionType.excludeNull(myContext), true));
}
else {
python/src/com/jetbrains/python/psi/types/PyTypeChecker.java
+6 -2
View File
@@ -346,13 +346,17 @@ public class PyTypeChecker {
}
public static boolean isUnknown(@Nullable PyType type) {
if (type == null || type instanceof PyGenericType) {
return isUnknown(type, true);
}
public static boolean isUnknown(@Nullable PyType type, boolean genericsAreUnknown) {
if (type == null || (genericsAreUnknown && type instanceof PyGenericType)) {
return true;
}
if (type instanceof PyUnionType) {
final PyUnionType union = (PyUnionType)type;
for (PyType t : union.getMembers()) {
if (isUnknown(t)) {
if (isUnknown(t, genericsAreUnknown)) {
return true;
}
}
python/testData/quickdoc/OptionalAndUnionTypesContainingTypeVars.html
+1
View File
@@ -0,0 +1 @@
<html><body><code>def <b>f</b>(x1:&nbsp;Optional[T],&nbsp;x2:&nbsp;Union[T,&nbsp;Tuple[Any,&nbsp;Any]])<br>Inferred&nbsp;type:&nbsp;(x1:&nbsp;Optional[TypeVar('T',&nbsp;<a href="psi_element://#typename#int">int</a>)],&nbsp;x2:&nbsp;Union[TypeVar('T',&nbsp;<a href="psi_element://#typename#int">int</a>),&nbsp;Tuple[Any,&nbsp;Any]])&nbsp;-&gt;&nbsp;None<br></code></body></html>
python/testData/quickdoc/OptionalAndUnionTypesContainingTypeVars.py
+11
View File
@@ -0,0 +1,11 @@
from typing import TypeVar, Optional, Union, Tuple, Any
T = TypeVar('T', int)
def f(x1: Optional[T], x2: Union[T, Tuple[Any, Any]]):
print(x1, x2)
<the_ref>f
python/testSrc/com/jetbrains/python/PyQuickDocTest.java
+6
View File
@@ -282,4 +282,10 @@ public class PyQuickDocTest extends LightMarkedTestCase {
myFixture.copyDirectoryToProject("typing", "");
runWithLanguageLevel(LanguageLevel.PYTHON35, this::checkHTMLOnly);
}
// PY-22730
public void testOptionalAndUnionTypesContainingTypeVars() {
myFixture.copyDirectoryToProject("typing", "");
runWithLanguageLevel(LanguageLevel.PYTHON36, this::checkHTMLOnly);
}
}