Extract Function: Drop extra space in modifier list

#KT-23274 Fixed
This commit is contained in:
Alexey Sedunov
2018-03-16 16:26:11 +03:00
parent 0a0043a851
commit 2104a0fa2b
4 changed files with 29 additions and 1 deletions
@@ -65,7 +65,9 @@ private fun buildSignature(config: ExtractionGeneratorConfiguration, renderer: D
else -> CallableBuilder.Target.READ_ONLY_PROPERTY
}
return CallableBuilder(builderTarget).apply {
val modifiers = listOf(config.descriptor.visibility) + config.descriptor.modifiers.map { it.value }
val visibility = config.descriptor.visibility
val extraModifiers = config.descriptor.modifiers.map { it.value }
val modifiers = if (visibility.isNotEmpty()) listOf(visibility) + extraModifiers else extraModifiers
modifier(modifiers.joinToString(separator = " "))
typeParams(
@@ -0,0 +1,9 @@
// PARAM_DESCRIPTOR: public suspend inline fun <reified T> ExtendMe.receive(): T defined in root package in file extractSuspend.kt
// PARAM_TYPES: ExtendMe
suspend inline fun <reified T> ExtendMe.receive(): T = <selection>receive("")</selection> as T
class ExtendMe {
suspend fun receive(s: String): Any {
return Any()
}
}
@@ -0,0 +1,11 @@
// PARAM_DESCRIPTOR: public suspend inline fun <reified T> ExtendMe.receive(): T defined in root package in file extractSuspend.kt
// PARAM_TYPES: ExtendMe
suspend inline fun <reified T> ExtendMe.receive(): T = any() as T
suspend fun ExtendMe.any() = receive("")
class ExtendMe {
suspend fun receive(s: String): Any {
return Any()
}
}
@@ -935,6 +935,12 @@ public class ExtractionTestGenerated extends AbstractExtractionTest {
doExtractFunctionTest(fileName);
}
@TestMetadata("extractSuspend.kt")
public void testExtractSuspend() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extractSuspend.kt");
doExtractFunctionTest(fileName);
}
@TestMetadata("extractToEnumClassBody.kt")
public void testExtractToEnumClassBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt");