From d941deb17caf21ca43b798fccae7e7194aa2bd45 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 27 May 2014 15:55:42 +0400
Subject: [PATCH] Enable members sorting in file structure view

---
 .../structureView/JetStructureViewModel.java  | 11 ++++++-
 .../fileStructure/InheritedMembers.after      |  2 +-
 .../structureView/fileStructure/Render.after  | 30 +++++++++----------
 .../fileStructure/SeveralClasses.after        |  2 +-
 .../structureView/fileStructure/Simple.after  |  4 +--
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java
index 795c8b8e4ab..72a6fcd9dc8 100644
--- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java
+++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,22 @@
 package org.jetbrains.jet.plugin.structureView;
 
 import com.intellij.ide.structureView.StructureViewModelBase;
+import com.intellij.ide.util.treeView.smartTree.Sorter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 
 public class JetStructureViewModel extends StructureViewModelBase {
+    private static final Sorter[] sorters = new Sorter[] {Sorter.ALPHA_SORTER};
+
     public JetStructureViewModel(@NotNull JetFile jetFile) {
         super(jetFile, new JetStructureViewElement(jetFile));
         withSuitableClasses(JetDeclaration.class);
     }
+
+    @NotNull
+    @Override
+    public Sorter[] getSorters() {
+        return sorters;
+    }
 }
diff --git a/idea/testData/structureView/fileStructure/InheritedMembers.after b/idea/testData/structureView/fileStructure/InheritedMembers.after
index 3ac350bee0a..4f4301722d1 100644
--- a/idea/testData/structureView/fileStructure/InheritedMembers.after
+++ b/idea/testData/structureView/fileStructure/InheritedMembers.after
@@ -1,2 +1,2 @@
 -InheritedMembers.kt
- Test (<root>)
+ Test
diff --git a/idea/testData/structureView/fileStructure/Render.after b/idea/testData/structureView/fileStructure/Render.after
index bdd79431150..2cf2e49dee6 100644
--- a/idea/testData/structureView/fileStructure/Render.after
+++ b/idea/testData/structureView/fileStructure/Render.after
@@ -1,15 +1,4 @@
 -Render.kt
- test1(): Unit
- test2(String?): Unit
- test3(T, U): Unit
- test4(T): Unit
- test5(): String
- test6(): Comparable<String>
- extension1() on String: Unit
- extension2() on Comparable<T>: Unit
- a: Int
- a: String on Comparable<T>
- b: Any
  A1
  -A2
   a: Int
@@ -26,15 +15,26 @@
   -<class object>
    test(): Unit
  -A7
-  a: Int
   <class initializer>
+  a: Int
+ a: Int
+ a: String on Comparable<T>
+ b: Any
  -Enum1 : Enum<Enum1>
   FIRST : Enum1
   SECOND : Enum1
- Trait
- Trait1 : Trait
+ extension1() on String: Unit
+ extension2() on Comparable<T>: Unit
+ test1(): Unit
+ test2(String?): Unit
+ test3(T, U): Unit
+ test4(T): Unit
+ test5(): String
+ test6(): Comparable<String>
  TestWithWhere
  testWithWhere(): Unit
+ Trait
+ Trait1 : Trait
+ withDefaulArgs(Int = ..., String = ...): Unit
  -WithDefaultArgs
   a: Int
- withDefaulArgs(Int = ..., String = ...): Unit
diff --git a/idea/testData/structureView/fileStructure/SeveralClasses.after b/idea/testData/structureView/fileStructure/SeveralClasses.after
index 52e8c4c8a42..3841602e458 100644
--- a/idea/testData/structureView/fileStructure/SeveralClasses.after
+++ b/idea/testData/structureView/fileStructure/SeveralClasses.after
@@ -1,5 +1,5 @@
 -SeveralClasses.kt
  A
  B
- Some : B, A
  Other : A
+ Some : B, A
diff --git a/idea/testData/structureView/fileStructure/Simple.after b/idea/testData/structureView/fileStructure/Simple.after
index a5f062100a8..e374ab7eb26 100644
--- a/idea/testData/structureView/fileStructure/Simple.after
+++ b/idea/testData/structureView/fileStructure/Simple.after
@@ -1,6 +1,6 @@
 -Simple.kt
  -Test
-  str: String
-  some: Int
   foo(): Int
   other(): Unit
+  some: Int
+  str: String