MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-33665 - AIOOBE: IntroduceVariableBase.createArrayCreationExpression

Browse Source
This commit is contained in:
anna
2012-02-14 18:54:07 +01:00
parent a829ba2568
commit 281a692bff
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+6 -2
View File
@@ -369,7 +369,11 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
}
}
catch (IncorrectOperationException e) {
return createArrayCreationExpression(text, startOffset, endOffset, PsiTreeUtil.getParentOfType(elementAt, PsiMethodCallExpression.class));
if (elementAt instanceof PsiExpressionList) {
final PsiElement parent = elementAt.getParent();
return parent instanceof PsiCallExpression ? createArrayCreationExpression(text, startOffset, endOffset, (PsiCallExpression)parent) : null;
}
return null;
}
return tempExpr;
@@ -384,7 +388,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
return null;
}
private static PsiExpression createArrayCreationExpression(String text, int startOffset, int endOffset, PsiMethodCallExpression parent) {
private static PsiExpression createArrayCreationExpression(String text, int startOffset, int endOffset, PsiCallExpression parent) {
if (text == null || parent == null) return null;
final String[] varargsExpressions = text.split("s*,s*");
if (varargsExpressions.length > 1) {