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

[python] PY-85031 Use PyAstNamedParameter.isSelf when reporting legacy positional-only parameters

Browse Source 
It correctly takes into account the first argument of `__new__` that is also implicit,
and thus should be excluded when reporting positional-only parameters following
non-positional-only ones.


(cherry picked from commit abf09c6be5e49c21c12264d22bf63a51018fdcd6)

IJ-MR-180323

GitOrigin-RevId: 85fb7ea284a237252e8634344b968981eda56dc3
This commit is contained in:
Mikhail Golubev
2025-10-22 17:20:30 +03:00
committed by intellij-monorepo-bot
parent c298afb0e5
commit 24990ca39b
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
View File

@@ -790,15 +790,6 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
return getStubOrPsiChild(PyStubElementTypes.ANNOTATION);
}
/**
* is `function` a method or a classmethod
*/
public static boolean isMethod(PyFunction function) {
final var isMethod = ScopeUtil.getScopeOwner(function) instanceof PyClass;
final var modifier = function.getModifier();
return (isMethod && modifier == null) || modifier == CLASSMETHOD;
}
/**
* @param self should be this
*/

4
python/python-psi-impl/src/com/jetbrains/python/validation/PyParameterListAnnotatorVisitor.java
View File

@@ -19,7 +19,6 @@ import com.intellij.lang.annotation.HighlightSeverity;
import com.jetbrains.python.PyPsiBundle;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.ParamHelper;
import com.jetbrains.python.psi.impl.PyFunctionImpl;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
@@ -38,7 +37,6 @@ public class PyParameterListAnnotatorVisitor extends PyElementVisitor {
@Override
public void visitPyParameterList(final @NotNull PyParameterList paramlist) {
final LanguageLevel languageLevel = LanguageLevel.forElement(paramlist);
final var hasImplicit = paramlist.getParent() instanceof PyFunction function && PyFunctionImpl.isMethod(function);
ParamHelper.walkDownParamArray(
paramlist.getParameters(),
@@ -55,7 +53,7 @@ public class PyParameterListAnnotatorVisitor extends PyElementVisitor {
@Override
public void visitNamedParameter(PyNamedParameter parameter, boolean first, boolean last) {
final var name = parameter.getName();
if (!hadKeyword && name != null && !(hasImplicit && first) && !isPrivate(name)) {
if (!hadKeyword && name != null && !parameter.isSelf() && !isPrivate(name)) {
hadKeyword = true;
}
else if (hadKeyword && !hadPositionalContainer && !hadSingleStar && name != null && !hadSlash && isPrivate(name)) {

3
python/testData/highlighting/historicalPositionalOnlyParameters.py
View File

@@ -15,4 +15,5 @@ class A:
@staticmethod
def s1(__b): pass
@staticmethod
def s1(a, <warning descr="Positional-only parameter follows parameter that is not positional-only">__b</warning>): pass
def s1(a, <warning descr="Positional-only parameter follows parameter that is not positional-only">__b</warning>): pass
def __new__(cls, __b): pass