From 30f00bb618bc11d296f11976049ae6529018efae Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 18 Jul 2016 20:16:56 +0200 Subject: [PATCH] fix muted test MultiFileIntentionTestGenerated.testImplementAbstractMember_implementVarInJava_ImplementAllInJava: apply intention in deterministic order, remove trailing space in expected output file --- .../idea/intentions/ImplementAbstractMemberIntention.kt | 7 ++++--- .../implementVarInJava/after/source/inheritors.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt index 8e1582611a0..2868434c62d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt @@ -217,10 +217,11 @@ abstract class ImplementAbstractMemberIntentionBase : classesToProcess.singleOrNull()?.let { return implementInClass(element, it.singletonList()) } - if (ApplicationManager.getApplication().isUnitTestMode) return implementInClass(element, classesToProcess) - val renderer = ClassRenderer() - val list = JBList(classesToProcess.sortedWith(renderer.comparator)).apply { + val sortedClasses = classesToProcess.sortedWith(renderer.comparator) + if (ApplicationManager.getApplication().isUnitTestMode) return implementInClass(element, sortedClasses) + + val list = JBList(sortedClasses).apply { selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION cellRenderer = renderer } diff --git a/idea/testData/multiFileIntentions/implementAbstractMember/implementVarInJava/after/source/inheritors.java b/idea/testData/multiFileIntentions/implementAbstractMember/implementVarInJava/after/source/inheritors.java index 88d2d3f5bd0..fa3588b6d7a 100644 --- a/idea/testData/multiFileIntentions/implementAbstractMember/implementVarInJava/after/source/inheritors.java +++ b/idea/testData/multiFileIntentions/implementAbstractMember/implementVarInJava/after/source/inheritors.java @@ -45,7 +45,7 @@ class W implements T { @Override public void setFoo(Integer integer) { - + } }