From e8aee5cddfb459ed41dbc9009cd4fa5ec39f3965 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 13 Nov 2014 19:01:55 +0300
Subject: [PATCH] Sorting descriptors in DecompiledTextFactory is redundant

---
 .../decompiler/textBuilder/DecompiledTextFactory.kt    | 10 ++--------
 .../textBuilder/DecompiledTextConsistencyTest.kt       |  3 ++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
index 5f08aad4eaa..3269930449c 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
@@ -101,12 +101,6 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
         }
     }
 
-    fun sortDeclarations(input: Collection<DeclarationDescriptor>): List<DeclarationDescriptor> {
-        val r = ArrayList(input)
-        Collections.sort(r, MemberComparator.INSTANCE)
-        return r
-    }
-
     fun saveDescriptorToRange(descriptor: DeclarationDescriptor, startOffset: Int, endOffset: Int) {
         renderedDescriptorsToRange[descriptorToKey(descriptor)] = TextRange(startOffset, endOffset)
     }
@@ -153,7 +147,7 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
                     builder.append(subindent)
                     appendDescriptor(classObject, subindent)
                 }
-                for (member in sortDeclarations(descriptor.getDefaultType().getMemberScope().getDescriptors())) {
+                for (member in descriptor.getDefaultType().getMemberScope().getDescriptors()) {
                     if (member.getContainingDeclaration() != descriptor) {
                         continue
                     }
@@ -188,7 +182,7 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
     }
 
     appendDecompiledTextAndPackageName()
-    for (member in sortDeclarations(descriptors)) {
+    for (member in descriptors) {
         appendDescriptor(member, "")
         builder.append("\n")
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
index 64320f2c3c0..fef557a4637 100644
--- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.jet.lang.resolve.BindingTraceContext
 import org.jetbrains.jet.lang.resolve.name.ClassId
+import org.jetbrains.jet.lang.resolve.MemberComparator
 
 public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() {
 
@@ -76,6 +77,6 @@ class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompile
         val packageView = module.getPackage(packageFqName) ?: return listOf()
         return packageView.getMemberScope().getAllDescriptors() filter {
             it is CallableMemberDescriptor && DescriptorUtils.getContainingModule(it) != KotlinBuiltIns.getInstance().getBuiltInsModule()
-        }
+        } sortBy MemberComparator.INSTANCE
     }
 }
\ No newline at end of file