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 Avoid creating code fragment for annotation if AST replaced stub already

Browse Source
This commit is contained in:
Mikhail Golubev
2017-07-19 19:28:31 +03:00
parent 09030f96ad
commit a84963397f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
+5 -2
View File
@@ -22,6 +22,7 @@ import com.google.common.collect.Sets;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.StubBasedPsiElement;
import com.intellij.psi.impl.source.resolve.FileContextUtil;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
@@ -623,7 +624,8 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
@Nullable
private static PyExpression getAnnotationValue(@NotNull PyAnnotationOwner owner, @NotNull TypeEvalContext context) {
if (context.maySwitchToAST(owner)) {
final boolean elementWasParsed = owner instanceof StubBasedPsiElement && ((StubBasedPsiElement)owner).getStub() == null;
if (context.maySwitchToAST(owner) || elementWasParsed) {
final PyAnnotation annotation = owner.getAnnotation();
if (annotation != null) {
return annotation.getValue();
@@ -665,7 +667,8 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
@Nullable
private static Ref<PyType> getVariableTypeCommentType(@NotNull String contents, @NotNull PsiElement anchor, @NotNull Context context) {
final PyExpression expr = PyUtil.createExpressionFromFragment(contents, anchor);
// TODO pass the real anchor as the context element for the fragment to resolve local classes/type aliases
final PyExpression expr = PyUtil.createExpressionFromFragment(contents, anchor.getContainingFile());
if (expr != null) {
// Such syntax is specific to "# type:" comments, unpacking in type hints is not allowed anywhere else
if (expr instanceof PyTupleExpression) {
python/testSrc/com/jetbrains/python/PyTypingTest.java
+1 -1
View File
@@ -451,7 +451,7 @@ public class PyTypingTest extends PyTestCase {
// PY-18427
public void testConditionalType() {
doTest("Union[str, int]",
doTest("Union[int, str]",
"if something:\n" +
" Type = int\n" +
"else:\n" +