MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-70247 Disallow stub to AST switch for pyi files

Browse Source 
GitOrigin-RevId: 8c84d83dcffc4aaf64c0e7bc719de2fdbe7629af
This commit is contained in:
Petr
2025-08-27 16:21:31 +02:00
committed by intellij-monorepo-bot
parent b4252ba8ab
commit b3249cfdb5
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java
View File

@@ -17,6 +17,7 @@ import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyTypeProvider;
import com.jetbrains.python.psi.resolve.PyResolveContext;
import com.jetbrains.python.psi.resolve.RatedResolveResult;
import com.jetbrains.python.pyi.PyiLanguageDialect;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -68,15 +69,15 @@ public sealed class TypeEvalContext {
}
public boolean allowDataFlow(PsiElement element) {
return myConstraints.myAllowDataFlow || inOrigin(element);
return myConstraints.myAllowDataFlow && !inPyiFile(element) || inOrigin(element);
}
public boolean allowReturnTypes(PsiElement element) {
return myConstraints.myAllowDataFlow || inOrigin(element);
return myConstraints.myAllowDataFlow && !inPyiFile(element) || inOrigin(element);
}
public boolean allowCallContext(@NotNull PsiElement element) {
return myConstraints.myAllowCallContext && inOrigin(element);
return myConstraints.myAllowCallContext && !inPyiFile(element) && inOrigin(element);
}
/**
@@ -316,7 +317,7 @@ public sealed class TypeEvalContext {
}
public boolean maySwitchToAST(@NotNull PsiElement element) {
return myConstraints.myAllowStubToAST || inOrigin(element);
return myConstraints.myAllowStubToAST && !inPyiFile(element) || inOrigin(element);
}
public @Nullable PsiFile getOrigin() {
@@ -356,6 +357,14 @@ public sealed class TypeEvalContext {
return myConstraints.myOrigin == element.getContainingFile() || myConstraints.myOrigin == getContextFile(element);
}
private static boolean inPyiFile(@NotNull PsiElement element) {
if (isPyiFile(element.getContainingFile())) {
return true;
}
PsiFile contextFile = getContextFile(element);
return contextFile != null && isPyiFile(contextFile);
}
private static PsiFile getContextFile(@NotNull PsiElement element) {
PsiFile file = element.getContainingFile();
if (file == null) return null;
@@ -368,6 +377,10 @@ public sealed class TypeEvalContext {
}
}
private static boolean isPyiFile(@NotNull PsiFile file) {
return file.getLanguage().equals(PyiLanguageDialect.getInstance());
}
private static class PyNullType implements PyType {
private PyNullType() {}