From 9f63bb060320d9546503e91909d70a7ec841f2f1 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Thu, 7 Sep 2017 10:56:01 +0300
Subject: [PATCH] sort workspace items - folders first - close #250

---
 dub.json                         |  2 +-
 src/dlangide/ui/newfile.d        |  3 ++-
 src/dlangide/workspace/project.d | 12 ++++++++++++
 views/VERSION                    |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dub.json b/dub.json
index d0d30e8..d46361f 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
     "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
 
     "dependencies": {
-        "dlangui": "==0.9.113",
+        "dlangui": "==0.9.114",
         "dcd": "~>0.9.1"
     },
 
diff --git a/src/dlangide/ui/newfile.d b/src/dlangide/ui/newfile.d
index 1ecfbaa..a9fce75 100644
--- a/src/dlangide/ui/newfile.d
+++ b/src/dlangide/ui/newfile.d
@@ -239,6 +239,8 @@ class NewFileDlg : Dialog {
             }
             _edModuleName.text = toUTF32(m);
             _packageName = m;
+            if (_currentTemplate.kind == FileKind.PACKAGE && _packageName.length == 0)
+                return setError("Package should be located in subdirectory");
         } else {
             string projectPath = _project.dir;
             if (!isSubdirOf(_location, projectPath))
@@ -345,4 +347,3 @@ class ProjectTemplate {
         this.kind = kind;
     }
 }
-
diff --git a/src/dlangide/workspace/project.d b/src/dlangide/workspace/project.d
index fc2db3b..9e1f71b 100644
--- a/src/dlangide/workspace/project.d
+++ b/src/dlangide/workspace/project.d
@@ -202,6 +202,17 @@ class ProjectFolder : ProjectItem {
                 _children.remove(i);
             }
         }
+        sortItems();
+    }
+
+    /// predicate for sorting project items
+    static bool compareProjectItemsLess(ProjectItem item1, ProjectItem item2) {
+        return ((item1.isFolder && !item2.isFolder) || ((item1.isFolder == item2.isFolder) && (item1.name < item2.name)));
+    }
+
+    void sortItems() {
+        import std.algorithm.sorting : sort;
+        sort!compareProjectItemsLess(_children.asArray);
     }
 
     string relativeToAbsolutePath(string path) {
@@ -218,6 +229,7 @@ class ProjectFolder : ProjectItem {
     }
 }
 
+
 /// Project source file
 class ProjectSourceFile : ProjectItem {
     this(string filename) {
diff --git a/views/VERSION b/views/VERSION
index 54e2ad8..c5441ad 100644
--- a/views/VERSION
+++ b/views/VERSION
@@ -1 +1 @@
-v0.7.66
\ No newline at end of file
+v0.7.67
\ No newline at end of file