MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix ScopeUtilCore.getScopeOwner for immediate PyDecorator and PyNamedParameter elements

Browse Source 
GitOrigin-RevId: 6013da7fbdf9e41ced1a32cae091d79014777a82
This commit is contained in:
Mikhail Golubev
2024-08-27 12:09:17 +03:00
committed by intellij-monorepo-bot
parent 71b010feed
commit 44e22f679c
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
python/python-ast/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtilCore.java
View File

@@ -1,12 +1,13 @@
package com.jetbrains.python.codeInsight.dataflow.scope;
import com.intellij.extapi.psi.StubBasedPsiElementBase;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.StubBasedPsiElement;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.ast.*;
import com.jetbrains.python.ast.controlFlow.AstScopeOwner;
import org.jetbrains.annotations.ApiStatus;
@@ -33,18 +34,23 @@ public final class ScopeUtilCore {
final PsiElement context = element.getContext();
return context instanceof AstScopeOwner ? (AstScopeOwner)context : getScopeOwner(context);
}
if (element instanceof StubBasedPsiElement) {
final StubElement stub = ((StubBasedPsiElement<?>)element).getStub();
if (element instanceof StubBasedPsiElement<?> stubBasedElement) {
final StubElement<?> stub = stubBasedElement.getStub();
if (stub != null) {
StubElement parentStub = stub.getParentStub();
while (parentStub != null) {
final PsiElement parent = parentStub.getPsi();
if (parent instanceof AstScopeOwner) {
return (AstScopeOwner)parent;
}
parentStub = parentStub.getParentStub();
AstScopeOwner firstOwner = stub.getParentStubOfType(AstScopeOwner.class);
AstScopeOwner nextOwner;
if (firstOwner != null && !(firstOwner instanceof PsiFile)) {
StubElement<?> firstOwnerStub = ((StubBasedPsiElementBase<?>)firstOwner).getStub();
assert firstOwnerStub != null;
nextOwner = firstOwnerStub.getParentStubOfType(AstScopeOwner.class);
}
return null;
else {
nextOwner = null;
}
if (stub.getParentStubOfType(PyAstDecoratorList.class) != null) {
return nextOwner;
}
return firstOwner;
}
}
return CachedValuesManager.getCachedValue(element, () -> CachedValueProvider.Result
@@ -59,7 +65,7 @@ public final class ScopeUtilCore {
}
final AstScopeOwner nextOwner = getParentOfType(firstOwner, AstScopeOwner.class);
// References in decorator expressions are resolved outside of the function (if the lambda is not inside the decorator)
final PyAstElement decoratorAncestor = getParentOfType(element, PyAstDecorator.class);
final PyAstElement decoratorAncestor = getParentOfType(element, PyAstDecorator.class, false);
if (decoratorAncestor != null && !isAncestor(decoratorAncestor, firstOwner, true)) {
return nextOwner;
}
@@ -67,7 +73,7 @@ public final class ScopeUtilCore {
* References in default values are resolved outside of the function (if the lambda is not inside the default value).
* Annotations of parameters are resolved outside of the function if the function doesn't have type parameters list
*/
final PyAstNamedParameter parameterAncestor = getParentOfType(element, PyAstNamedParameter.class);
final PyAstNamedParameter parameterAncestor = getParentOfType(element, PyAstNamedParameter.class, false);
if (parameterAncestor != null && !isAncestor(parameterAncestor, firstOwner, true)) {
final PyAstExpression defaultValue = parameterAncestor.getDefaultValue();
final PyAstAnnotation annotation = parameterAncestor.getAnnotation();