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

Cosmetic changes

Browse Source
This commit is contained in:
Ilya.Kazakevich
2014-03-12 21:27:39 +04:00
parent 1146cb6873
commit 97eddb8fc5
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/PyAssignmentToLoopOrWithParameterInspection.java
+21 -21
View File
@@ -51,23 +51,23 @@ public class PyAssignmentToLoopOrWithParameterInspection extends PyInspection {
@NotNull
@Override
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder,
boolean isOnTheFly,
final boolean isOnTheFly,
@NotNull final LocalInspectionToolSession session) {
return new Visitor(holder, session);
}
private static class Visitor extends PyInspectionVisitor {
private Visitor(@Nullable ProblemsHolder holder, @NotNull LocalInspectionToolSession session) {
private Visitor(@Nullable final ProblemsHolder holder, @NotNull final LocalInspectionToolSession session) {
super(holder, session);
}
@Override
public void visitPyWithStatement(PyWithStatement node) {
public void visitPyWithStatement(final PyWithStatement node) {
checkNotReDeclaringUpperLoopOrStatement(node);
}
@Override
public void visitPyForStatement(PyForStatement node) {
public void visitPyForStatement(final PyForStatement node) {
checkNotReDeclaringUpperLoopOrStatement(node);
}
@@ -75,11 +75,11 @@ public class PyAssignmentToLoopOrWithParameterInspection extends PyInspection {
* Finds first parent of specific type (See {@link #isRequiredStatement(com.intellij.psi.PsiElement)})
* that declares one of names, declared in this statement
*/
private void checkNotReDeclaringUpperLoopOrStatement(NameDefiner statement) {
for (PsiElement declaredVar : statement.iterateNames()) {
Filter filter = new Filter(handleSubscriptionsAndResolveSafely(declaredVar));
PsiElement firstParent = PsiTreeUtil.findFirstParent(statement, true, filter);
if (firstParent != null && isRequiredStatement(firstParent)) {
private void checkNotReDeclaringUpperLoopOrStatement(@NotNull final NameDefiner statement) {
for (final PsiElement declaredVar : statement.iterateNames()) {
final Filter filter = new Filter(handleSubscriptionsAndResolveSafely(declaredVar));
final PsiElement firstParent = PsiTreeUtil.findFirstParent(statement, true, filter);
if ((firstParent != null) && isRequiredStatement(firstParent)) {
registerProblem(declaredVar,
PyBundle.message("INSP.NAME.assignment.to.loop.or.with.parameter.display.message", declaredVar.getText()));
}
@@ -88,30 +88,30 @@ public class PyAssignmentToLoopOrWithParameterInspection extends PyInspection {
}
/**
* Filters list of parents trying to find parent that declares var that refers to {@link #node}
* Filters list of parents trying to find parent that declares var that refers to {@link #myNode}
* Returns {@link com.jetbrains.python.codeInsight.controlflow.ScopeOwner} if nothing found.
* Returns parent otherwise.
*/
private static class Filter implements Condition<PsiElement> {
private final PsiElement node;
private final PsiElement myNode;
private Filter(PsiElement node) {
this.node = node;
private Filter(final PsiElement node) {
this.myNode = node;
}
@Override
public boolean value(PsiElement psiElement) {
public boolean value(final PsiElement psiElement) {
if (psiElement instanceof ScopeOwner) {
return true; //Do not go any further
}
if (!(isRequiredStatement(psiElement))) {
if (!isRequiredStatement(psiElement)) {
return false; //Parent has wrong type, skip
}
Iterable<PyElement> varsDeclaredInStatement = ((NameDefiner)psiElement).iterateNames();
for (PsiElement varDeclaredInStatement : varsDeclaredInStatement) {
final Iterable<PyElement> varsDeclaredInStatement = ((NameDefiner)psiElement).iterateNames();
for (final PsiElement varDeclaredInStatement : varsDeclaredInStatement) {
//For each variable, declared by this parent take first declaration and open subscription list if any
PsiReference reference = handleSubscriptionsAndResolveSafely(varDeclaredInStatement).getReference();
if (reference != null && reference.isReferenceTo(node)) {
final PsiReference reference = handleSubscriptionsAndResolveSafely(varDeclaredInStatement).getReference();
if ((reference != null) && reference.isReferenceTo(myNode)) {
return true; //One of variables declared by this parent refers to node
}
}
@@ -142,8 +142,8 @@ public class PyAssignmentToLoopOrWithParameterInspection extends PyInspection {
* @param element to check
* @return true if inspection should work with this element
*/
private static boolean isRequiredStatement(PsiElement element) {
private static boolean isRequiredStatement(final PsiElement element) {
assert element != null;
return element instanceof PyWithStatement || element instanceof PyForStatement;
return (element instanceof PyWithStatement) || (element instanceof PyForStatement);
}
}