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-18816 Don't rely on presence of stubs if unstubbing is not allowed

Browse Source 
Namely, if the stub tree was already replaced by AST, use it instead
but in a restricted manner as if these type aliases were taken from
stubs to prevent stochastic errors (like we do already in other places
in code insight).
This commit is contained in:
Mikhail Golubev
2017-07-19 19:28:31 +03:00
parent a701318d1b
commit 807f2a7e03
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
+12 -10
View File
@@ -39,6 +39,7 @@ import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyExpressionCodeFragmentImpl;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.psi.impl.stubs.PyTypingAliasStubType;
import com.jetbrains.python.psi.resolve.*;
import com.jetbrains.python.psi.stubs.PyTargetExpressionStub;
import com.jetbrains.python.psi.stubs.PyTypingAliasStub;
@@ -786,25 +787,26 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
// Presumably, a TypeVar definition or a type alias
if (element instanceof PyTargetExpression) {
final PyTargetExpression targetExpr = (PyTargetExpression)element;
PyExpression assignedValue = null;
if (context.maySwitchToAST(expression)) {
final PyExpression assignedValue = targetExpr.findAssignedValue();
if (assignedValue != null) {
elements.add(assignedValue);
continue;
}
assignedValue = targetExpr.findAssignedValue();
}
else {
final PyTargetExpressionStub stub = targetExpr.getStub();
if (stub != null) {
final PyTypingAliasStub aliasStub = stub.getCustomStub(PyTypingAliasStub.class);
if (aliasStub != null) {
final PyExpression assignedValue = createExpressionFromFragment(aliasStub.getText(), expression);
if (assignedValue != null) {
elements.add(assignedValue);
continue;
}
assignedValue = createExpressionFromFragment(aliasStub.getText(), expression);
}
}
else {
// Use PSI to get the assigned value but only if the same expression would be saved in stubs
assignedValue = PyTypingAliasStubType.getAssignedValueIfTypeAliasLike(targetExpr);
}
}
if (assignedValue != null) {
elements.add(assignedValue);
continue;
}
}
if (isBuiltinPathLike(element)) {
python/src/com/jetbrains/python/psi/impl/stubs/PyTypingAliasStubType.java
+9 -3
View File
@@ -52,14 +52,20 @@ public class PyTypingAliasStubType extends CustomTargetExpressionStubType<PyTypi
@Nullable
@Override
public PyTypingAliasStub createStub(PyTargetExpression psi) {
if (!PyUtil.isTopLevel(psi) || !looksLikeTypeAliasTarget(psi)) {
final PyExpression value = getAssignedValueIfTypeAliasLike(psi);
return value != null ? new PyTypingTypeAliasStubImpl(value.getText()) : null;
}
@Nullable
public static PyExpression getAssignedValueIfTypeAliasLike(@NotNull PyTargetExpression target) {
if (!PyUtil.isTopLevel(target) || !looksLikeTypeAliasTarget(target)) {
return null;
}
final PyExpression value = psi.findAssignedValue();
final PyExpression value = target.findAssignedValue();
if (value == null || !looksLikeTypeHint(value)) {
return null;
}
return new PyTypingTypeAliasStubImpl(value.getText());
return value;
}
private static boolean looksLikeTypeAliasTarget(@NotNull PyTargetExpression target) {