From 17fc1d95624fe69fd0e53362c5ec7b0ac676ac83 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 6 Oct 2015 22:00:01 +0300
Subject: [PATCH] Do not sort twice

---
 .../org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt    | 3 +--
 .../jps/build/classFilesComparison/classFilesComparison.kt     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index f0090f46b95..727b5256a70 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -383,14 +383,13 @@ internal class DescriptorRendererImpl(
         } ?: emptyList()
         val defaultList = parameterDescriptorsWithDefaultValue.filter { !allValueArguments.containsKey(it) }.map {
             "${it.getName().asString()} = ..."
-        }.sorted()
+        }
         val argumentList = allValueArguments.entrySet()
                 .map { entry ->
                     val name = entry.key.getName().asString()
                     val value = if (!parameterDescriptorsWithDefaultValue.contains(entry.key)) renderConstant(entry.value) else "..."
                     "$name = $value"
                 }
-                .sorted()
         return (defaultList + argumentList).sorted()
     }
 
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
index edaa010f617..4025ae926fd 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
@@ -53,7 +53,7 @@ fun getDirectoryString(dir: File, interestingPaths: List<String>): String {
         val listFiles = dir.listFiles()
         assertNotNull(listFiles)
 
-        val children = listFiles!!.toList().sortedBy { it.getName() }.sortedBy { it.isDirectory() }
+        val children = listFiles!!.sortedWith(compareBy ({ it.directory }, { it.name } ))
         for (child in children) {
             if (child.isDirectory()) {
                 p.println(child.name)