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

[python] Make PyDecoratable interface extend PyElement

Browse Source 
It's always applied to Python-specific PSI elements. There is no need to do
a separate cast just to access methods of PsiElement.

GitOrigin-RevId: 481577fa8d2092df7884d6e611622f0bbd4d1e54
This commit is contained in:
Mikhail Golubev
2023-03-15 14:39:56 +02:00
committed by intellij-monorepo-bot
parent b1fd219835
commit 52b283f78f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/python-psi-impl/src/com/jetbrains/python/codeInsight/decorator/PyDecoratedFunctionTypeProvider.java
View File

@@ -25,10 +25,10 @@ public class PyDecoratedFunctionTypeProvider extends PyTypeProviderBase {
@Nullable
@Override
public Ref<PyType> getReferenceType(@NotNull PsiElement referenceTarget, @NotNull TypeEvalContext context, @Nullable PsiElement anchor) {
if (!(referenceTarget instanceof PyDecoratable) || !(referenceTarget instanceof PyElement)) {
if (!(referenceTarget instanceof PyDecoratable pyDecoratable)) {
return null;
}
PyDecoratorList decoratorList = ((PyDecoratable)referenceTarget).getDecoratorList();
PyDecoratorList decoratorList = pyDecoratable.getDecoratorList();
if (decoratorList == null) {
return null;
}
@@ -47,12 +47,12 @@ public class PyDecoratedFunctionTypeProvider extends PyTypeProviderBase {
return RecursionManager.doPreventingRecursion(
Pair.create(referenceTarget, context),
false,
() -> evaluateType(referenceTarget, context, decorators)
() -> evaluateType(pyDecoratable, context, decorators)
);
}
@Nullable
private static Ref<PyType> evaluateType(@NotNull PsiElement referenceTarget,
private static Ref<PyType> evaluateType(@NotNull PyDecoratable referenceTarget,
@NotNull TypeEvalContext context,
@NotNull List<PyDecorator> decorators) {
PyExpression fakeCallExpression = fakeCallExpression(referenceTarget, decorators, context);
@@ -63,10 +63,9 @@ public class PyDecoratedFunctionTypeProvider extends PyTypeProviderBase {
}
@Nullable
private static PyExpression fakeCallExpression(@NotNull PsiElement referenceTarget,
private static PyExpression fakeCallExpression(@NotNull PyDecoratable referenceTarget,
@NotNull List<PyDecorator> decorators,
@NotNull TypeEvalContext context) {
String callableName = referenceTarget instanceof PyElement ? ((PyElement)referenceTarget).getName() : "";
StringBuilder result = new StringBuilder();
for (PyDecorator decorator : decorators) {
@@ -80,7 +79,7 @@ public class PyDecoratedFunctionTypeProvider extends PyTypeProviderBase {
}
result.append("(");
}
result.append(callableName);
result.append(referenceTarget.getName());
StringUtil.repeatSymbol(result, ')', decorators.size());
return PyUtil.createExpressionFromFragment(result.toString(), referenceTarget.getContainingFile());