From 61f71efc6e7c5358d3b61cd015ef44b103fdd862 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Mon, 10 Oct 2016 17:38:57 +0300 Subject: [PATCH] Proper names for Python PSI classes for comprehension expressions They have "Py" prefix and do not contain ugly "Comprh" abbreviation anymore. --- ...ent.java => PyComprehensionComponent.java} | 2 +- .../python/psi/PyComprehensionElement.java | 6 ++-- ....java => PyComprehensionForComponent.java} | 2 +- ...t.java => PyComprehensionIfComponent.java} | 2 +- .../controlflow/PyControlFlowBuilder.java | 10 +++--- ...laceListComprehensionWithForIntention.java | 14 ++++---- .../inspections/PyTypeCheckerInspection.java | 2 +- .../quickfix/ConvertDictCompQuickFix.java | 14 ++++---- .../psi/impl/PyComprehensionElementImpl.java | 32 +++++++++---------- .../psi/impl/PyGeneratorExpressionImpl.java | 4 +-- .../impl/PyListCompExpressionNavigator.java | 4 +-- .../psi/impl/PyTargetExpressionImpl.java | 2 +- .../psi/impl/references/PyReferenceImpl.java | 2 +- .../validation/CompatibilityVisitor.java | 2 +- .../validation/UnsupportedFeaturesUtil.java | 4 +-- 15 files changed, 51 insertions(+), 51 deletions(-) rename python/psi-api/src/com/jetbrains/python/psi/{ComprehensionComponent.java => PyComprehensionComponent.java} (93%) rename python/psi-api/src/com/jetbrains/python/psi/{ComprhForComponent.java => PyComprehensionForComponent.java} (91%) rename python/psi-api/src/com/jetbrains/python/psi/{ComprhIfComponent.java => PyComprehensionIfComponent.java} (91%) diff --git a/python/psi-api/src/com/jetbrains/python/psi/ComprehensionComponent.java b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java similarity index 93% rename from python/psi-api/src/com/jetbrains/python/psi/ComprehensionComponent.java rename to python/psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java index 0137623556ff..431ccbc9f654 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/ComprehensionComponent.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java @@ -18,5 +18,5 @@ package com.jetbrains.python.psi; /** * @author yole */ -public interface ComprehensionComponent { +public interface PyComprehensionComponent { } diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java index 930d3f30d288..4ca9c9cb7435 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java @@ -22,7 +22,7 @@ import java.util.List; */ public interface PyComprehensionElement extends PyExpression, PyNamedElementContainer { PyExpression getResultExpression(); - List getComponents(); - List getForComponents(); - List getIfComponents(); + List getComponents(); + List getForComponents(); + List getIfComponents(); } diff --git a/python/psi-api/src/com/jetbrains/python/psi/ComprhForComponent.java b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java similarity index 91% rename from python/psi-api/src/com/jetbrains/python/psi/ComprhForComponent.java rename to python/psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java index ddb8b002e9a3..8469b9c27dcc 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/ComprhForComponent.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java @@ -20,7 +20,7 @@ package com.jetbrains.python.psi; * User: dcheryasov * Date: Jul 31, 2008 */ -public interface ComprhForComponent extends ComprehensionComponent { +public interface PyComprehensionForComponent extends PyComprehensionComponent { PyExpression getIteratorVariable(); PyExpression getIteratedList(); boolean isAsync(); diff --git a/python/psi-api/src/com/jetbrains/python/psi/ComprhIfComponent.java b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java similarity index 91% rename from python/psi-api/src/com/jetbrains/python/psi/ComprhIfComponent.java rename to python/psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java index 67c20d9b357f..cf7fa4604d48 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/ComprhIfComponent.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; * User: dcheryasov * Date: Jul 31, 2008 */ -public interface ComprhIfComponent extends ComprehensionComponent { +public interface PyComprehensionIfComponent extends PyComprehensionComponent { @Nullable PyExpression getTest(); } diff --git a/python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java b/python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java index d2c06fc23546..805000903f33 100644 --- a/python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java +++ b/python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java @@ -680,9 +680,9 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor { myBuilder.startNode(node); List iterators = new ArrayList<>(); - for (ComprehensionComponent component : node.getComponents()) { - if (component instanceof ComprhForComponent) { - final ComprhForComponent c = (ComprhForComponent) component; + for (PyComprehensionComponent component : node.getComponents()) { + if (component instanceof PyComprehensionForComponent) { + final PyComprehensionForComponent c = (PyComprehensionForComponent) component; final PyExpression iteratedList = c.getIteratedList(); final PyExpression iteratorVariable = c.getIteratorVariable(); if (prevCondition != null) { @@ -706,8 +706,8 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor { // Inner "for" and "if" constructs will be linked to all outer iterators iterators.add(iterator); } - else if (component instanceof ComprhIfComponent) { - final ComprhIfComponent c = (ComprhIfComponent) component; + else if (component instanceof PyComprehensionIfComponent) { + final PyComprehensionIfComponent c = (PyComprehensionIfComponent) component; final PyExpression condition = c.getTest(); if (condition == null) { continue; diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/ReplaceListComprehensionWithForIntention.java b/python/src/com/jetbrains/python/codeInsight/intentions/ReplaceListComprehensionWithForIntention.java index 96bd47d70288..60c5c21bdadd 100644 --- a/python/src/com/jetbrains/python/codeInsight/intentions/ReplaceListComprehensionWithForIntention.java +++ b/python/src/com/jetbrains/python/codeInsight/intentions/ReplaceListComprehensionWithForIntention.java @@ -93,19 +93,19 @@ public class ReplaceListComprehensionWithForIntention implements IntentionAction private static PyForStatement createForLoop(final PyListCompExpression expression, final PyElementGenerator elementGenerator, final String result) { - final List components = expression.getComponents(); + final List components = expression.getComponents(); final StringBuilder stringBuilder = new StringBuilder(); int slashNum = 1; - for (ComprehensionComponent component : components) { - if (component instanceof ComprhForComponent) { + for (PyComprehensionComponent component : components) { + if (component instanceof PyComprehensionForComponent) { stringBuilder.append("for "); - stringBuilder.append(((ComprhForComponent)component).getIteratorVariable().getText()); + stringBuilder.append(((PyComprehensionForComponent)component).getIteratorVariable().getText()); stringBuilder.append(" in "); - stringBuilder.append(((ComprhForComponent)component).getIteratedList().getText()); + stringBuilder.append(((PyComprehensionForComponent)component).getIteratedList().getText()); stringBuilder.append(":\n"); } - if (component instanceof ComprhIfComponent) { - final PyExpression test = ((ComprhIfComponent)component).getTest(); + if (component instanceof PyComprehensionIfComponent) { + final PyExpression test = ((PyComprehensionIfComponent)component).getTest(); if (test != null) { stringBuilder.append("if "); stringBuilder.append(test.getText()); diff --git a/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java b/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java index 168787f634e4..3c6be927fe1f 100644 --- a/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java @@ -130,7 +130,7 @@ public class PyTypeCheckerInspection extends PyInspection { public void visitPyComprehensionElement(PyComprehensionElement node) { super.visitPyComprehensionElement(node); - for (ComprhForComponent forComponent : node.getForComponents()) { + for (PyComprehensionForComponent forComponent : node.getForComponents()) { checkIteratedValue(forComponent.getIteratedList(), forComponent.isAsync()); } } diff --git a/python/src/com/jetbrains/python/inspections/quickfix/ConvertDictCompQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/ConvertDictCompQuickFix.java index f22abf21bdf4..707a5d8c9cac 100644 --- a/python/src/com/jetbrains/python/inspections/quickfix/ConvertDictCompQuickFix.java +++ b/python/src/com/jetbrains/python/inspections/quickfix/ConvertDictCompQuickFix.java @@ -57,20 +57,20 @@ public class ConvertDictCompQuickFix implements LocalQuickFix { final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project); assert keyValueExpression.getValue() != null; - final List components = expression.getComponents(); + final List components = expression.getComponents(); final StringBuilder replacement = new StringBuilder("dict([(" + keyValueExpression.getKey().getText() + ", " + keyValueExpression.getValue().getText() + ")"); int slashNum = 1; - for (ComprehensionComponent component : components) { - if (component instanceof ComprhForComponent) { + for (PyComprehensionComponent component : components) { + if (component instanceof PyComprehensionForComponent) { replacement.append("for "); - replacement.append(((ComprhForComponent)component).getIteratorVariable().getText()); + replacement.append(((PyComprehensionForComponent)component).getIteratorVariable().getText()); replacement.append(" in "); - replacement.append(((ComprhForComponent)component).getIteratedList().getText()); + replacement.append(((PyComprehensionForComponent)component).getIteratedList().getText()); replacement.append(" "); } - if (component instanceof ComprhIfComponent) { - final PyExpression test = ((ComprhIfComponent)component).getTest(); + if (component instanceof PyComprehensionIfComponent) { + final PyExpression test = ((PyComprehensionIfComponent)component).getTest(); if (test != null) { replacement.append("if "); replacement.append(test.getText()); diff --git a/python/src/com/jetbrains/python/psi/impl/PyComprehensionElementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyComprehensionElementImpl.java index 9bba3733637d..ec207cdec09a 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyComprehensionElementImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyComprehensionElementImpl.java @@ -53,11 +53,11 @@ public abstract class PyComprehensionElementImpl extends PyElementImpl implement * In "[x+1 for x in (1,2,3)]" a "for component" is "x". * @return all "for components" */ - public List getForComponents() { - final List list = new ArrayList<>(5); + public List getForComponents() { + final List list = new ArrayList<>(5); visitComponents(new ComprehensionElementVisitor() { @Override - void visitForComponent(ComprhForComponent component) { + void visitForComponent(PyComprehensionForComponent component) { list.add(component); } }); @@ -81,7 +81,7 @@ public abstract class PyComprehensionElementImpl extends PyElementImpl implement .map(asyncNode -> asyncNode.getElementType() == PyTokenTypes.ASYNC_KEYWORD) .orElse(false); - visitor.visitForComponent(new ComprhForComponent() { + visitor.visitForComponent(new PyComprehensionForComponent() { public PyExpression getIteratorVariable() { return variable; } @@ -98,7 +98,7 @@ public abstract class PyComprehensionElementImpl extends PyElementImpl implement } else if (type == PyTokenTypes.IF_KEYWORD) { final PyExpression test = (PyExpression)next.getPsi(); - visitor.visitIfComponent(new ComprhIfComponent() { + visitor.visitIfComponent(new PyComprehensionIfComponent() { public PyExpression getTest() { return test; } @@ -108,27 +108,27 @@ public abstract class PyComprehensionElementImpl extends PyElementImpl implement } } - public List getIfComponents() { - final List list = new ArrayList<>(5); + public List getIfComponents() { + final List list = new ArrayList<>(5); visitComponents(new ComprehensionElementVisitor() { @Override - void visitIfComponent(ComprhIfComponent component) { + void visitIfComponent(PyComprehensionIfComponent component) { list.add(component); } }); return list; } - public List getComponents() { - final List list = new ArrayList<>(5); + public List getComponents() { + final List list = new ArrayList<>(5); visitComponents(new ComprehensionElementVisitor() { @Override - void visitForComponent(ComprhForComponent component) { + void visitForComponent(PyComprehensionForComponent component) { list.add(component); } @Override - void visitIfComponent(ComprhIfComponent component) { + void visitIfComponent(PyComprehensionIfComponent component) { list.add(component); } }); @@ -148,10 +148,10 @@ public abstract class PyComprehensionElementImpl extends PyElementImpl implement @NotNull public List getNamedElements() { // extract whatever names are defined in "for" components - List fors = getForComponents(); + List fors = getForComponents(); PyExpression[] for_targets = new PyExpression[fors.size()]; int i = 0; - for (ComprhForComponent for_comp : fors) { + for (PyComprehensionForComponent for_comp : fors) { for_targets[i] = for_comp.getIteratorVariable(); i += 1; } @@ -171,10 +171,10 @@ public abstract class PyComprehensionElementImpl extends PyElementImpl implement } abstract class ComprehensionElementVisitor { - void visitIfComponent(ComprhIfComponent component) { + void visitIfComponent(PyComprehensionIfComponent component) { } - void visitForComponent(ComprhForComponent component) { + void visitForComponent(PyComprehensionForComponent component) { } } } diff --git a/python/src/com/jetbrains/python/psi/impl/PyGeneratorExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyGeneratorExpressionImpl.java index a3fc0769a69b..ea87e28c080a 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyGeneratorExpressionImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyGeneratorExpressionImpl.java @@ -59,10 +59,10 @@ public class PyGeneratorExpressionImpl extends PyComprehensionElementImpl implem @NotNull public List getNamedElements() { // extract whatever names are defined in "for" components - List fors = getForComponents(); + List fors = getForComponents(); PyExpression[] for_targets = new PyExpression[fors.size()]; int i = 0; - for (ComprhForComponent for_comp : fors) { + for (PyComprehensionForComponent for_comp : fors) { for_targets[i] = for_comp.getIteratorVariable(); i += 1; } diff --git a/python/src/com/jetbrains/python/psi/impl/PyListCompExpressionNavigator.java b/python/src/com/jetbrains/python/psi/impl/PyListCompExpressionNavigator.java index 9bef48e97dc6..9101e2699dbb 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyListCompExpressionNavigator.java +++ b/python/src/com/jetbrains/python/psi/impl/PyListCompExpressionNavigator.java @@ -17,7 +17,7 @@ package com.jetbrains.python.psi.impl; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; -import com.jetbrains.python.psi.ComprhForComponent; +import com.jetbrains.python.psi.PyComprehensionForComponent; import com.jetbrains.python.psi.PyExpression; import com.jetbrains.python.psi.PyListCompExpression; import org.jetbrains.annotations.Nullable; @@ -35,7 +35,7 @@ public class PyListCompExpressionNavigator { if (listCompExpression == null){ return null; } - for (ComprhForComponent component : listCompExpression.getForComponents()) { + for (PyComprehensionForComponent component : listCompExpression.getForComponents()) { final PyExpression variable = component.getIteratorVariable(); if (variable != null && PsiTreeUtil.isAncestor(variable, element, false)){ return listCompExpression; diff --git a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java index c1cc7d6608a8..51bc6141dd5c 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java @@ -320,7 +320,7 @@ public class PyTargetExpressionImpl extends PyBaseElementImpl nodes = node.getForComponents().stream().map(ComprhForComponent::getIteratedList).collect(Collectors.toList()); + final List nodes = node.getForComponents().stream().map(PyComprehensionForComponent::getIteratedList).collect(Collectors.toList()); registerForAllMatchingVersions(level -> UnsupportedFeaturesUtil.visitPyListCompExpression(node, level), " not support this syntax in list comprehensions.", nodes, diff --git a/python/src/com/jetbrains/python/validation/UnsupportedFeaturesUtil.java b/python/src/com/jetbrains/python/validation/UnsupportedFeaturesUtil.java index ee977762a057..656495e4dc28 100644 --- a/python/src/com/jetbrains/python/validation/UnsupportedFeaturesUtil.java +++ b/python/src/com/jetbrains/python/validation/UnsupportedFeaturesUtil.java @@ -144,9 +144,9 @@ public class UnsupportedFeaturesUtil { } public static boolean visitPyListCompExpression(final PyListCompExpression node, LanguageLevel versionToProcess) { - final List forComponents = node.getForComponents(); + final List forComponents = node.getForComponents(); if (versionToProcess.isPy3K()) { - for (ComprhForComponent forComponent : forComponents) { + for (PyComprehensionForComponent forComponent : forComponents) { final PyExpression iteratedList = forComponent.getIteratedList(); if (iteratedList instanceof PyTupleExpression) { return true;