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-15603 Initial implementation by Artem Malykh (squashed)

Browse Source 
GitOrigin-RevId: b8b6addb65ad2b6b52c3a0c84ef43c3986778077
This commit is contained in:
AMalykh
2019-07-08 21:02:18 +03:00
committed by intellij-monorepo-bot
parent 650e8b2238
commit 83dc1fbc2d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/actions/PyQualifiedNameProvider.java
+9 -5
View File
@@ -30,6 +30,9 @@ import java.util.Collection;
public class PyQualifiedNameProvider implements QualifiedNameProvider {
public static final char SEPARATOR = '.';
@Override
public PsiElement adjustElementToCopy(PsiElement element) {
return element instanceof PyClass || element instanceof PyFunction ? element : null;
@@ -44,11 +47,11 @@ public class PyQualifiedNameProvider implements QualifiedNameProvider {
if (element instanceof PyFunction) {
final PyClass containingClass = ((PyFunction)element).getContainingClass();
if (containingClass != null) {
return containingClass.getQualifiedName() + "#" + ((PyFunction)element).getName();
return containingClass.getQualifiedName() + SEPARATOR + ((PyFunction)element).getName();
}
else {
return ((PyFunction)element).getQualifiedName();
}
}
}
return null;
}
@@ -64,12 +67,13 @@ public class PyQualifiedNameProvider implements QualifiedNameProvider {
if (!functions.isEmpty()) {
return ContainerUtil.getFirstItem(functions);
}
final int sharpIdx = fqn.indexOf("#");
final int sharpIdx = fqn.lastIndexOf(SEPARATOR);
if (sharpIdx > -1) {
final String className = StringUtil.getPackageName(fqn, '#');
final String className = StringUtil.getPackageName(fqn, SEPARATOR);
aClass = PyClassNameIndex.findClass(className, project);
if (aClass != null) {
final String memberName = StringUtil.getShortName(fqn, '#');
final String memberName = StringUtil.getShortName(fqn, SEPARATOR);
final PyClass nestedClass = aClass.findNestedClass(memberName, false);
if (nestedClass != null) return nestedClass;
final PyFunction methodByName = aClass.findMethodByName(memberName, false, null);