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

Don't apply substitution from ancestor if class defines its own type variable (PY-27783)

Browse Source
This commit is contained in:
Semyon Proshev
2018-04-09 17:48:57 +03:00
parent 91af98d772
commit 9bdf80e66e
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/types/PyTypeChecker.java
+9 -1
View File
@@ -754,13 +754,21 @@ public class PyTypeChecker {
for (PyClassType type : toPossibleClassTypes(qualifierType)) {
for (PyTypeProvider provider : Extensions.getExtensions(PyTypeProvider.EP_NAME)) {
final PyType genericType = provider.getGenericType(type.getPyClass(), context);
final Set<PyGenericType> providedTypeGenerics = new LinkedHashSet<>();
if (genericType != null) {
match(genericType, type, context, substitutions);
collectGenerics(genericType, context, providedTypeGenerics, new HashSet<>());
}
for (Map.Entry<PyType, PyType> entry : provider.getGenericSubstitutions(type.getPyClass(), context).entrySet()) {
final PyGenericType genericKey = as(entry.getKey(), PyGenericType.class);
final PyType value = entry.getValue();
if (genericKey != null && value != null && !substitutions.containsKey(genericKey)) {
if (genericKey != null &&
value != null &&
!substitutions.containsKey(genericKey) &&
!providedTypeGenerics.contains(genericKey)) {
substitutions.put(genericKey, value);
}
}
python/testSrc/com/jetbrains/python/Py3TypeTest.java
+21
View File
@@ -953,6 +953,27 @@ public class Py3TypeTest extends PyTestCase {
);
}
// PY-27783
public void testApplyingSuperSubstituionToGenericClass() {
runWithLanguageLevel(
LanguageLevel.PYTHON36,
() -> doTest("Dict[T, int]",
"from typing import TypeVar, Generic, Dict, List\n" +
"\n" +
"T = TypeVar('T')\n" +
"\n" +
"class A(Generic[T]):\n" +
" pass\n" +
"\n" +
"class B(A[List[T]], Generic[T]):\n" +
" def __init__(self) -> None:\n" +
" self.value_set: Dict[T, int] = {}\n" +
"\n" +
" def foo(self) -> None:\n" +
" expr = self.value_set")
);
}
private void doTest(final String expectedType, final String text) {
myFixture.configureByText(PythonFileType.INSTANCE, text);
final PyExpression expr = myFixture.findElementByText("expr", PyExpression.class);