From 3e4d1cf78cc2e6e3fc9df6f42b6de590e4f3a6bb Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Mon, 23 Jun 2014 23:35:08 +0400 Subject: [PATCH] [JavaFolding] inline literal argument names if argument length is one --- .../folding/impl/JavaFoldingBuilderBase.java | 6 ++---- .../codeInsight/folding/JavaFoldingTest.groovy | 12 ++++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java index eaec44653978..e165ba718467 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java @@ -791,10 +791,8 @@ public abstract class JavaFoldingBuilderBase extends CustomFoldingBuilder implem PsiParameter methodParam = parameters[i]; if (PsiType.NULL.equals(callArgument.getType()) || methodParam.getType().equals(callArgument.getType())) { TextRange range = callArgument.getTextRange(); - if (range.getLength() > 1) { - String placeholderText = methodParam.getName() + ": " + callArgument.getText(); - foldElements.add(new NamedFoldingDescriptor(callArgument, range.getStartOffset(), range.getEndOffset(), null, placeholderText)); - } + String placeholderText = methodParam.getName() + ": " + callArgument.getText(); + foldElements.add(new NamedFoldingDescriptor(callArgument, range.getStartOffset(), range.getEndOffset(), null, placeholderText)); } } } 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 5159e484c7e0..c68fb5a7cc43 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy @@ -672,7 +672,7 @@ public class VarArgTest { assert regions[1].placeholderText == "test: 13" } - public void "test do not inline if argument length is one (EA-57555)"() { + public void "test inline if argument length is one (EA-57555)"() { def text = """ public class CharSymbol { @@ -689,9 +689,13 @@ public class CharSymbol { """ configure text def regions = myFixture.editor.foldingModel.allFoldRegions.sort { it.startOffset } - assert regions.size() == 3 - checkRangeOffsetByPositionInText(regions[1], text, "false") - assert regions[1].placeholderText == "fast: false" + assert regions.size() == 4 + + checkRangeOffsetByPositionInText(regions[1], text, "1") + assert regions[1].placeholderText == "test: 1" + + checkRangeOffsetByPositionInText(regions[2], text, "false") + assert regions[2].placeholderText == "fast: false" } public void "test inline constructor literal arguments names"() {