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-80683 Groovy: Extract Closure Parameter: do not add package prefix to created variables

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-02-13 18:27:49 +04:00
parent 6ac0baeb8b
commit 5ceed4c461
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
+4 -2
View File
@@ -43,6 +43,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.lang.GrReferenceAdjuster;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.lexer.TokenSets;
import org.jetbrains.plugins.groovy.lang.psi.*;
@@ -446,7 +447,8 @@ public abstract class GroovyRefactoringUtil {
/* if (declareFinal) {
com.intellij.psi.util.PsiUtil.setModifierProperty((decl.getMembers()[0]), PsiModifier.FINAL, true);
}*/
((GrStatementOwner)anchorStatement.getParent()).addStatementBefore(decl, (GrStatement)anchorStatement);
final GrStatement statement = ((GrStatementOwner)anchorStatement.getParent()).addStatementBefore(decl, (GrStatement)anchorStatement);
GrReferenceAdjuster.shortenReferences(statement);
return id;
}
@@ -506,7 +508,7 @@ public abstract class GroovyRefactoringUtil {
return false;
}
}
else if (newName.startsWith("'") || newName.startsWith("\"")) {
else if (StringUtil.startsWithChar(newName, '\'') || StringUtil.startsWithChar(newName, '"')) {
if (newName.length() < 2 || !newName.endsWith("'")) {
return false;
}