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-32853 - NPE: RefactoringUtil.getAnchorElementForMultipleExpressions

Browse Source
This commit is contained in:
anna
2012-02-27 12:37:47 +01:00
parent cafc582feb
commit abfbf75264
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+3 -3
View File
@@ -315,7 +315,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
private static void addInitializationToSetUp(final PsiExpression initializer,
final PsiField field,
final OccurrenceManager occurrenceManager,
final PsiExpression[] occurrences,
final boolean replaceAll,
final PsiClass parentClass) throws IncorrectOperationException {
final PsiMethod setupMethod = TestFrameworks.getInstance().findOrCreateSetUpMethod(parentClass);
@@ -325,7 +325,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
PsiElement anchor = null;
if (PsiTreeUtil.isAncestor(setupMethod, initializer, true)) {
anchor = replaceAll
? occurrenceManager.getAnchorStatementForAllInScope(setupMethod)
? RefactoringUtil.getAnchorElementForMultipleExpressions(occurrences, setupMethod)
: PsiTreeUtil.getParentOfType(initializer, PsiStatement.class);
}
@@ -742,7 +742,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
addInitializationToConstructors(initializer, myField, enclosingConstructor, myParentClass);
}
if (initializerPlace == InitializationPlace.IN_SETUP_METHOD && initializer != null) {
addInitializationToSetUp(initializer, myField, myOccurrenceManager, myReplaceAll, myParentClass);
addInitializationToSetUp(initializer, myField, myOccurrences, myReplaceAll, myParentClass);
}
if (mySelectedExpr.getParent() instanceof PsiParenthesizedExpression) {
mySelectedExpr = (PsiExpression)mySelectedExpr.getParent();