"Merge with next when": made applicable when delimited by ';' or comment

So #KT-12042 Fixed
This commit is contained in:
Toshiaki Kameyama
2018-04-23 08:15:00 +03:00
committed by Mikhail Glukhikh
parent cdbd7a7c5a
commit 449943da01
6 changed files with 84 additions and 5 deletions
@@ -3245,6 +3245,16 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/merge"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
}
@TestMetadata("hasCommentBetweenWhen.kt")
public void testHasCommentBetweenWhen() throws Exception {
runTest("idea/testData/intentions/branched/when/merge/hasCommentBetweenWhen.kt");
}
@TestMetadata("hasSemicolonBetweenWhen.kt")
public void testHasSemicolonBetweenWhen() throws Exception {
runTest("idea/testData/intentions/branched/when/merge/hasSemicolonBetweenWhen.kt");
}
@TestMetadata("mergeBlockWithBlock.kt")
public void testMergeBlockWithBlock() throws Exception {
runTest("idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt");