Merge branch 'typing'

This commit is contained in:
Andrey Vlasovskikh
2014-08-22 19:23:56 +04:00
15 changed files with 1390 additions and 113 deletions
@@ -22,9 +22,7 @@ import org.jetbrains.annotations.Nullable;
/**
* @author yole
*/
public interface PyAnnotation extends PyElement, StubBasedPsiElement<PyAnnotationStub> {
PyExpression getValue();
public interface PyAnnotation extends PyTypedElement, StubBasedPsiElement<PyAnnotationStub> {
@Nullable
PyClass resolveToClass();
PyExpression getValue();
}
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
* @author yole
*/
public interface PyTargetExpression extends PyQualifiedExpression, PsiNamedElement, PsiNameIdentifierOwner, PyDocStringOwner,
StubBasedPsiElement<PyTargetExpressionStub> {
PyQualifiedNameOwner, StubBasedPsiElement<PyTargetExpressionStub> {
PyTargetExpression[] EMPTY_ARRAY = new PyTargetExpression[0];
/**