From e2a379324226db03db2eb8f4f0621dcac70bdb2e Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Tue, 24 Jun 2014 19:13:25 +0400 Subject: [PATCH] JavaFolding: parameter names for literal call arguments are inlined by default --- .../codeInsight/folding/impl/JavaCodeFoldingSettingsBase.java | 2 +- .../com/intellij/codeInsight/folding/JavaFoldingTest.groovy | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsBase.java b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsBase.java index 2b5188e46374..647a1e45ac13 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsBase.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsBase.java @@ -14,7 +14,7 @@ public class JavaCodeFoldingSettingsBase extends JavaCodeFoldingSettings { @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_I18N_MESSAGES = true; @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_SUPPRESS_WARNINGS = true; @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_END_OF_LINE_COMMENTS = false; - @SuppressWarnings({"WeakerAccess"}) public boolean INLINE_PARAMETER_NAMES_FOR_LITERAL_CALL_ARGUMENTS = false; + @SuppressWarnings({"WeakerAccess"}) public boolean INLINE_PARAMETER_NAMES_FOR_LITERAL_CALL_ARGUMENTS = true; @Override public boolean isCollapseImports() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy index bcba24804d28..c68fb5a7cc43 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy @@ -53,7 +53,6 @@ public class JavaFoldingTest extends LightCodeInsightFixtureTestCase { myFoldingSettings = JavaCodeFoldingSettings.instance as JavaCodeFoldingSettingsImpl myFoldingStateToRestore = new JavaCodeFoldingSettingsImpl() myFoldingStateToRestore.loadState(myFoldingSettings) - myFoldingSettings.setInlineParameterNamesForLiteralCallArguments(true) } @Override