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

IDEA-68142 Groovy: false "Variable already defined" inspection

Browse Source
This commit is contained in:
Maxim Medvedev
2011-04-15 16:00:21 +04:00
parent 206d5dc8eb
commit 927b94ff88
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrForStatement.java
+7 -5
View File
@@ -16,9 +16,9 @@
package org.jetbrains.plugins.groovy.lang.psi.api.statements;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.psi.api.formatter.GrControlStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.clauses.GrForClause;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import com.intellij.psi.PsiElement;
/**
@@ -26,12 +26,14 @@ import com.intellij.psi.PsiElement;
*/
public interface GrForStatement extends GrControlStatement, GrLoopStatement {
public GrForClause getClause();
@Nullable
GrForClause getClause();
public GrStatement getBody();
@Nullable
GrStatement getBody();
public PsiElement getRParenth();
PsiElement getRParenth();
public PsiElement getLParenth();
PsiElement getLParenth();
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrForStatementImpl.java
+6 -8
View File
@@ -18,12 +18,12 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiModifierList;
import com.intellij.psi.ResolveState;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
@@ -52,10 +52,12 @@ public class GrForStatementImpl extends GroovyPsiElementImpl implements GrForSta
return "For statement";
}
@Nullable
public GrForClause getClause() {
return findChildByClass(GrForClause.class);
}
@Nullable
public GrStatement getBody() {
return findChildByClass(GrStatement.class);
}
@@ -67,15 +69,11 @@ public class GrForStatementImpl extends GroovyPsiElementImpl implements GrForSta
GrForClause forClause = getClause();
final GrVariable varScope = PsiTreeUtil.getParentOfType(place, GrVariable.class);
if (forClause == null) return true;
if (lastParent == null || lastParent instanceof GrForInClause) return true;
GrVariable var = forClause.getDeclaredVariable();
if (var == null) return true;
final PsiModifierList modifierList = var.getModifierList();
boolean isAvailableOutsideOfFor = modifierList == null || modifierList.getTextLength() == 0;
if (lastParent != null && !(lastParent instanceof GrForInClause) || lastParent == null && isAvailableOutsideOfFor) {
if (!var.equals(varScope) && !ResolveUtil.processElement(processor, var, state)) return false;
}
if (var == null || var.equals(varScope)) return true;
if (!ResolveUtil.processElement(processor, var, state)) return false;
return true;
}