MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Do not wrap first method call in a call chain, if it is only one call in chain

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2015-06-02 17:42:01 +03:00
parent cb312433a6
commit 788906a0b3
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/ChainMethodCallsBlockBuilder.java
+26 -21
View File
@@ -67,34 +67,40 @@ class ChainMethodCallsBlockBuilder {
private List<Block> buildBlocksFrom(List<ASTNode> nodes) {
List<ChainedCallChunk> methodCall = splitMethodCallOnChunksByDots(nodes);
myWrap = getNewWrap(mySettings.WRAP_FIRST_METHOD_IN_CALL_CHAIN);
myChainedCallsAlignment = getNewAlignment();
Wrap wrapToUse = null;
Alignment alignmentToUse = null;
myWrap = null;
myChainedCallsAlignment = null;
List<Block> blocks = new ArrayList<Block>();
for (ChainedCallChunk currentCallChunk : methodCall) {
for (int i = 0; i < methodCall.size(); i++) {
ChainedCallChunk currentCallChunk = methodCall.get(i);
if (isMethodCall(currentCallChunk)) {
wrapToUse = myWrap;
alignmentToUse = shouldAlignMethod(currentCallChunk, methodCall) ? myChainedCallsAlignment : null;
if (myWrap == null) myWrap = createCallChunkWrap(i, methodCall);
if (myChainedCallsAlignment == null) myChainedCallsAlignment = createCallChunkAlignment(i, methodCall);
}
else if (wrapToUse != null) {
wrapToUse = null;
alignmentToUse = null;
myChainedCallsAlignment = getNewAlignment();
myWrap = getNewWrap(mySettings.WRAP_FIRST_METHOD_IN_CALL_CHAIN);
else {
myWrap = null;
myChainedCallsAlignment = null;
}
SyntheticBlockBuilder builder = new SyntheticBlockBuilder(mySettings, myJavaSettings);
blocks.add(builder.create(currentCallChunk.nodes, wrapToUse, alignmentToUse));
blocks.add(builder.create(currentCallChunk.nodes, myWrap, myChainedCallsAlignment));
}
return blocks;
}
private Wrap createCallChunkWrap(int chunkIndex, @NotNull List<ChainedCallChunk> methodCall) {
if (mySettings.WRAP_FIRST_METHOD_IN_CALL_CHAIN) {
ChainedCallChunk next = chunkIndex + 1 < methodCall.size() ? methodCall.get(chunkIndex + 1) : null;
if (next != null && isMethodCall(next)) {
return Wrap.createWrap(getWrapType(mySettings.METHOD_CALL_CHAIN_WRAP), true);
}
}
return Wrap.createWrap(getWrapType(mySettings.METHOD_CALL_CHAIN_WRAP), false);
}
private boolean shouldAlignMethod(ChainedCallChunk currentMethodChunk, List<ChainedCallChunk> methodCall) {
return mySettings.ALIGN_MULTILINE_CHAINED_METHODS
&& !currentMethodChunk.isEmpty()
@@ -122,12 +128,11 @@ class ChainMethodCallsBlockBuilder {
return result;
}
private Alignment getNewAlignment() {
return AbstractJavaBlock.createAlignment(mySettings.ALIGN_MULTILINE_CHAINED_METHODS, null);
}
private Wrap getNewWrap(boolean wrapFirst) {
return Wrap.createWrap(getWrapType(mySettings.METHOD_CALL_CHAIN_WRAP), wrapFirst);
private Alignment createCallChunkAlignment(int chunkIndex, @NotNull List<ChainedCallChunk> methodCall) {
ChainedCallChunk current = methodCall.get(chunkIndex);
return shouldAlignMethod(current, methodCall)
? AbstractJavaBlock.createAlignment(mySettings.ALIGN_MULTILINE_CHAINED_METHODS, null)
: null;
}
private boolean isMethodCall(@NotNull ChainedCallChunk callChunk) {
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
+10
View File
@@ -619,4 +619,14 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest {
" .call());"
);
}
public void test_ChainedCalls_NoWrapOnSingleCall() {
getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS;
getSettings().WRAP_FIRST_METHOD_IN_CALL_CHAIN = true;
doMethodTest(
"obj.call( )",
"obj.call()"
);
}
}