Commit Graph

17 Commits

Author SHA1 Message Date
Tagir Valeev
867968eea8 DeclarationJoinLinesHandler: more careful precedence fix (IDEA-CR-34859) 2018-07-12 17:20:20 +07:00
Tagir Valeev
fa71413378 Revert "DeclarationJoinLinesHandler: respect precedence for both initializer and right-hand operand"
This reverts commit 7730b97e (IDEA-CR-34859)
2018-07-12 17:20:20 +07:00
Tagir Valeev
7730b97ee4 DeclarationJoinLinesHandler: respect precedence for both initializer and right-hand operand
Fixes IDEA-195416 Join lines over arithmetic operations should preserve order
Also StreamApiMigrationInspection#getOperationSign moved to TypeConversionUtil#getBinaryOperationText and reused
2018-07-12 11:26:49 +07:00
Tagir Valeev
6a0d8cba1a ChainCallJoinLinesHandler: disable when parent is not the same 2018-06-01 10:46:14 +07:00
Tagir Valeev
2590753b28 NestedIfJoinLinesHandler: fix polyadic case.
Fixes IDEA-190660 ClassCastException after code reformatting using 'Join Lines'
Fixes EA-119515 - CCE: NestedIfJoinLinesHandler.tryJoinLines
2018-04-21 18:11:50 +07:00
Tagir Valeev
4b65e11e99 IDEA-130703 Join Lines (Ctrl-Shift-J) could join nested if's 2018-04-19 17:03:10 +07:00
Tagir Valeev
5f34c4c223 IDEA-190558 Join lines: smart concatenation of assignment and the subsequent reassignment with the method call 2018-04-19 15:50:25 +07:00
Tagir Valeev
279c952a11 IDEA-138747 Joining line with EOL comment 2018-04-19 15:50:24 +07:00
Tagir Valeev
cee5209a63 ChainCallJoinLinesHandler: disable when builder variable is self-referenced 2018-04-19 13:40:39 +07:00
Tagir Valeev
deeec13f53 IDEA-172368 'Join lines' could handle increment with 0 nicer 2018-04-19 13:36:15 +07:00
Tagir Valeev
eb75cfe87e ChainCallJoinLinesHandler: join chained calls; assignment/declaration+call
Fixes IDEA-54209 Join Lines should be able to merge multiple method calls into a chained call
2018-04-19 13:16:07 +07:00
Yaroslav Lepenkin
c6d8b2f05e join lines do not merge closing brace and catch keyword, when 'catch on new line' enabled (IDEA-179581) 2017-10-17 10:21:10 +03:00
Dmitry Batrak
758974a85a IDEA-177226 'Join lines' between two block comments works bad 2017-08-24 20:17:19 +03:00
Dmitry Batrak
4ae6919940 IDEA-169556 Join Lines inserts redundant space in some cases 2017-03-16 15:26:23 +03:00
Yaroslav Lepenkin
6731485cb8 Reformat with context on postponed formatting: fixed java test data 2015-07-07 17:24:09 +03:00
Dmitry Jemerov
9dee6e8ff3 join lines: convert end-of-line comments to block comments when possible (IDEABKL-290) 2015-02-12 12:35:06 +01:00
Dmitry Jemerov
831087097d move JoinLinesTest to java-tests 2015-02-12 12:35:05 +01:00