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

Rearrange branches in updateSingleUsage to make clearer how various cases are handled

Browse Source
This commit is contained in:
Mikhail Golubev
2015-03-30 16:46:34 +03:00
parent 0883ba1fec
commit 170185dbc5
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolProcessor.java
+29 -31
View File
@@ -142,40 +142,20 @@ public class PyMoveSymbolProcessor {
}
private void updateSingleUsage(@NotNull PsiElement usage, @NotNull PsiNamedElement newElement) {
final PsiFile usageFile = usage.getContainingFile();
if (belongsToSomeMovedElement(usage)) {
return;
}
// TODO: Respect the qualified import style
if (usage instanceof PyQualifiedExpression) {
PyQualifiedExpression expr = (PyQualifiedExpression)usage;
if (myMovedElement instanceof PyClass && PyNames.INIT.equals(expr.getName())) {
final PyQualifiedExpression qualifiedExpr = (PyQualifiedExpression)usage;
if (myMovedElement instanceof PyClass && PyNames.INIT.equals(qualifiedExpr.getName())) {
return;
}
if (expr.isQualified()) {
insertImportFromAndReplaceReference(newElement, expr);
else if (qualifiedExpr.isQualified()) {
insertImportFromAndReplaceReference(newElement, qualifiedExpr);
}
}
if (usage instanceof PyStringLiteralExpression) {
for (PsiReference ref : usage.getReferences()) {
if (ref instanceof PyDunderAllReference) {
usage.delete();
}
else {
if (ref.isReferenceTo(myMovedElement)) {
ref.bindToElement(newElement);
}
}
}
}
else {
// Update import of unqualified reference
final PyImportStatementBase importStmt = getImportStatementByElement(usage);
if (importStmt != null) {
PyClassRefactoringUtil.updateImportOfElement(importStmt, newElement);
}
// Do nothing if usage itself was moved too
if (belongsToSomeMovedElement(usage)) {
return;
}
final PsiFile usageFile = usage.getContainingFile();
if (usageFile == myMovedElement.getContainingFile() && usage instanceof PyQualifiedExpression) {
else if (usageFile == myMovedElement.getContainingFile()) {
if (usage.getParent() instanceof PyGlobalStatement) {
myScopeOwnersWithGlobal.add(ScopeUtil.getScopeOwner(usage));
if (((PyGlobalStatement)usage.getParent()).getGlobals().length == 1) {
@@ -186,10 +166,16 @@ public class PyMoveSymbolProcessor {
}
}
else if (myScopeOwnersWithGlobal.contains(ScopeUtil.getScopeOwner(usage))) {
insertQualifiedImportAndReplaceReference(newElement, (PyQualifiedExpression)usage);
insertQualifiedImportAndReplaceReference(newElement, qualifiedExpr);
}
else {
insertImportFromAndReplaceReference(newElement, (PyQualifiedExpression)usage);
insertImportFromAndReplaceReference(newElement, qualifiedExpr);
}
}
else {
final PyImportStatementBase importStmt = getImportStatementByElement(usage);
if (importStmt != null) {
PyClassRefactoringUtil.updateImportOfElement(importStmt, newElement);
}
}
if (resolvesToLocalStarImport(usage)) {
@@ -197,6 +183,18 @@ public class PyMoveSymbolProcessor {
myOptimizeImportTargets.add(usageFile);
}
}
else if (usage instanceof PyStringLiteralExpression) {
for (PsiReference ref : usage.getReferences()) {
if (ref instanceof PyDunderAllReference) {
usage.delete();
}
else {
if (ref.isReferenceTo(myMovedElement)) {
ref.bindToElement(newElement);
}
}
}
}
}
private boolean belongsToSomeMovedElement(@NotNull final PsiElement element) {