summaryrefslogtreecommitdiff
path: root/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java')
-rw-r--r--plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java
index 3bbc7a63bd65..aebb8f568814 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java
@@ -37,12 +37,11 @@ public class SplitDeclarationAndInitializationIntention extends Intention {
@Override
public void processIntention(@NotNull PsiElement element) {
final PsiField field = (PsiField)element.getParent();
- field.normalizeDeclaration();
- final PsiExpression initializer = RefactoringUtil.convertInitializerToNormalExpression(field.getInitializer(), field.getType());
+ final PsiExpression initializer = field.getInitializer();
if (initializer == null) {
return;
}
- final String initializerText = initializer.getText();
+ final String initializerText = RefactoringUtil.convertInitializerToNormalExpression(initializer, field.getType()).getText();
final PsiClass containingClass = field.getContainingClass();
if (containingClass == null) {
return;
@@ -96,9 +95,7 @@ public class SplitDeclarationAndInitializationIntention extends Intention {
}
}
initializer.delete();
- final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(manager.getProject());
- codeStyleManager.reformat(field);
- codeStyleManager.reformat(classInitializer);
+ CodeStyleManager.getInstance(manager.getProject()).reformat(classInitializer);
HighlightUtil.highlightElement(addedElement,
IntentionPowerPackBundle.message(
"press.escape.to.remove.highlighting.message"));