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-9472 Parameter info: losing popup when moving caret through calls as parameters

Browse Source
This commit is contained in:
Ekaterina Tuzova
2016-05-26 17:36:50 +03:00
parent 2f4e56fe96
commit a37412c38e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/PyParameterInfoHandler.java
+13 -4
View File
@@ -21,6 +21,7 @@ import com.intellij.lang.parameterInfo.*;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.text.CharArrayUtil;
import com.intellij.xml.util.XmlStringUtil;
@@ -58,7 +59,7 @@ public class PyParameterInfoHandler implements ParameterInfoHandler<PyArgumentLi
@Override
public PyArgumentList findElementForParameterInfo(@NotNull final CreateParameterInfoContext context) {
PyArgumentList argumentList = findArgumentList(context);
PyArgumentList argumentList = findArgumentList(context, -1);
if (argumentList != null) {
final PyCallExpression callExpr = argumentList.getCallExpression();
if (callExpr != null) {
@@ -74,8 +75,16 @@ public class PyParameterInfoHandler implements ParameterInfoHandler<PyArgumentLi
return null;
}
private static PyArgumentList findArgumentList(final ParameterInfoContext context) {
return ParameterInfoUtils.findParentOfType(context.getFile(), context.getOffset()-1, PyArgumentList.class);
private static PyArgumentList findArgumentList(final ParameterInfoContext context, int parameterListStart) {
final int offset = context.getOffset();
PyArgumentList argumentList = ParameterInfoUtils.findParentOfType(context.getFile(), offset - 1, PyArgumentList.class);
if (argumentList != null) {
final TextRange range = argumentList.getTextRange();
if (parameterListStart >= 0 && range.getStartOffset() != parameterListStart){
argumentList = PsiTreeUtil.getParentOfType(argumentList, PyArgumentList.class);
}
}
return argumentList;
}
@Override
@@ -85,7 +94,7 @@ public class PyParameterInfoHandler implements ParameterInfoHandler<PyArgumentLi
@Override
public PyArgumentList findElementForUpdatingParameterInfo(@NotNull final UpdateParameterInfoContext context) {
return findArgumentList(context);
return findArgumentList(context, context.getParameterListStart());
}
/**