Mikhail Golubev
d740159214
Merge remote-tracking branch 'origin/master' into mikhail.golubev/py-attribute-inference
...
Conflicts:
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java
python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
python/testSrc/com/jetbrains/python/codeInsight/PyClassMROTest.java
2014-12-25 15:32:43 +03:00
Andrey Vlasovskikh
b37b0440d0
PY-11932 Put nulls for unresolved class types in MRO
...
Some of the ancestor class-like types may be unresolved. The best we
can do is to put nulls for all the unresolved classes to appropriate
places inside the MRO chain. What we used to do in this case it return
the empty sequence of the ancestors.
2014-12-22 14:05:31 +03:00
Mikhail Golubev
af29e9ba36
Prevent recomputation of superclasses during first call to isNewStyleClass
2014-10-17 18:12:01 +04:00
Mikhail Golubev
3c7e51dcd7
Memoize result of MRO resolution
2014-10-16 21:47:51 +04:00
Andrey Vlasovskikh
196b3ce9b2
Fixed getting superclass from 'six.with_metaclass()' call
2013-09-16 21:32:48 +04:00
Ekaterina Tuzova
c022f2520f
added failing test for with_metaclass
2013-09-16 16:01:27 +04:00
Andrey Vlasovskikh
2eab025659
Added test for MRO in complicated diamond hierarchy (PY-4183)
2013-04-18 21:29:49 +04:00
Andrey Vlasovskikh
d6972abf2a
Fixed several bugs in new-style MRO algorithm
2013-04-18 21:03:50 +04:00
Mikhail Golubev
Andrey Vlasovskikh
Ekaterina Tuzova