From 8322d5c5cf0fdbec229a0e094d0a5d0bbf5f9365 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 6 Sep 2011 19:26:40 +0200 Subject: [PATCH] fix formatting (IDEA-73969) --- .../ReplaceDiamondWithExplicitTypeArgumentsIntention.java | 3 ++- .../diamond2explicit/ApplicableDiamondCheckFormatting.java | 4 ++++ .../ApplicableDiamondCheckFormatting_after.java | 4 ++++ .../types/ReplaceDiamondWithExplicitTypeIntentionTest.java | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting.java create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting_after.java diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeArgumentsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeArgumentsIntention.java index 9823e94505d7..1e701098d06f 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeArgumentsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeArgumentsIntention.java @@ -16,6 +16,7 @@ package com.siyeh.ipp.types; import com.intellij.psi.*; +import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.base.Intention; @@ -63,6 +64,6 @@ public class ReplaceDiamondWithExplicitTypeArgumentsIntention extends Intention JavaPsiFacade.getElementFactory(element.getProject()); final PsiJavaCodeReferenceElement newReference = elementFactory.createReferenceFromText(text.toString(), element); - javaCodeReferenceElement.replace(newReference); + CodeStyleManager.getInstance(javaCodeReferenceElement.getProject()).reformat(javaCodeReferenceElement.replace(newReference)); } } diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting.java new file mode 100644 index 000000000000..ee270319a90d --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting.java @@ -0,0 +1,4 @@ +import java.util.HashMap; +class Test { + HashMap map = new HashMap<>(); +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting_after.java new file mode 100644 index 000000000000..97b73e31083d --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/diamond2explicit/ApplicableDiamondCheckFormatting_after.java @@ -0,0 +1,4 @@ +import java.util.HashMap; +class Test { + HashMap map = new HashMap(); +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeIntentionTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeIntentionTest.java index e51a00b0667e..f8d48a4a4ece 100644 --- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeIntentionTest.java +++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/ReplaceDiamondWithExplicitTypeIntentionTest.java @@ -27,6 +27,10 @@ public class ReplaceDiamondWithExplicitTypeIntentionTest extends IPPTestCase { doTest(); } + public void testApplicableDiamondCheckFormatting() { + doTest(); + } + public void testExplicitTypeArgs() { doTest(); }