WIP

Author: SlavaRa

QuickNavigate/Forms/Nodes.cs

@@ -1,11 +1,33 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using ASCompletion;
 using ASCompletion.Model;
 using JetBrains.Annotations;
 
 namespace QuickNavigate.Forms
 {
+    public class NodeFactory
+    {
+        public static TreeNode CreateTreeNode(FileModel inFile, bool isHaxe, MemberModel it)
+        {
+            var flags = it.Flags;
+            var icon = PluginUI.GetIcon(flags, it.Access);
+            var constrDecl = isHaxe && (flags & FlagType.Constructor) > 0 ? "new" : it.FullName;
+            var node = new MemberNode(it.ToString(), icon, icon)
+            {
+                InFile = inFile,
+                Tag = $"{constrDecl}@{it.LineFrom}"
+            };
+            return node;
+        }
+
+        public static TreeNode CreateTreeNode(ClassModel classModel)
+        {
+            return new ClassNode(classModel, PluginUI.GetIcon(classModel.Flags, classModel.Access));
+        }
+    }
+
     public class MemberNode : TreeNode
     {
         public FileModel InFile;

QuickNavigate/Forms/QuickOutlineForm.cs

@@ -112,7 +112,7 @@ void FillTree()
             if (InFile.Members.Count > 0) AddMembers(tree.Nodes, InFile, InFile.Members, isHaxe);
             foreach (var classModel in InFile.Classes)
             {
-                var node = FormHelper.CreateTreeNode(classModel);
+                var node = NodeFactory.CreateTreeNode(classModel);
                 tree.Nodes.Add(node);
                 AddMembers(node.Nodes, InFile, classModel.Members, isHaxe, classModel.Equals(InClass));
             }
@@ -156,7 +156,7 @@ void AddMembers(TreeNodeCollection nodes, FileModel inFile, MemberList members,
             if (searchIsNotEmpty) items = SearchUtil.FindAll(items, search);
             foreach (var it in items)
             {
-                nodes.Add(FormHelper.CreateTreeNode(inFile, isHaxe, it));
+                nodes.Add(NodeFactory.CreateTreeNode(inFile, isHaxe, it));
             }
             if ((searchIsNotEmpty && SelectedNode == null || currentClass) && nodes.Count > 0)
                 tree.SelectedNode = nodes[0];

QuickNavigate/Forms/TypeExplorerForm.cs

@@ -137,7 +137,7 @@ void RefreshTree()
             ClassNode selectedNode = null;
             if (search.Length > 1 && search.Contains('.') && tree.Nodes.Count > 0)
             {
-                var node = SelectedNode as ClassNode ?? (ClassNode)tree.Nodes[0];
+                var node = SelectedNode as ClassNode ?? (ClassNode) tree.Nodes[0];
                 var parts = search.Split('.');
                 if (node.Name == parts[0])
                 {
@@ -151,7 +151,7 @@ void RefreshTree()
             {
                 if (search.Length == 0) FillTree();
                 else FillTree(search);
-                if (tree.Nodes.Count > 0) tree.SelectedNode = tree.Nodes[0];
+                tree.SelectedNode = tree.TopNode;
             }
             else
             {
@@ -206,7 +206,7 @@ void FillTree(ClassNode node, string search)
             if (search.Length > 0) items = SearchUtil.FindAll(items, search);
             foreach (var it in items)
             {
-                nodes.Add(FormHelper.CreateTreeNode(inFile, isHaxe, it));
+                nodes.Add(NodeFactory.CreateTreeNode(inFile, isHaxe, it));
             }
         }
 
@@ -232,7 +232,7 @@ static IEnumerable<ClassNode> CreateNodes([NotNull] IEnumerable<string> matches,
         static ClassNode CreateNode([NotNull] string type)
         {
             var classModel = TypeToClassModel[type];
-            return (ClassNode) FormHelper.CreateTreeNode(classModel);
+            return (ClassNode) NodeFactory.CreateTreeNode(classModel);
         }
 
         [NotNull]

QuickNavigate/Helpers/FormHelper.cs

@@ -123,24 +123,6 @@ static T GetPluginUI<T>(string pluginGUID)
             }
             return default(T);
         }
-
-        public static TreeNode CreateTreeNode(FileModel inFile, bool isHaxe, MemberModel it)
-        {
-            var flags = it.Flags;
-            var icon = PluginUI.GetIcon(flags, it.Access);
-            var constrDecl = isHaxe && (flags & FlagType.Constructor) > 0 ? "new" : it.FullName;
-            var node = new MemberNode(it.ToString(), icon, icon)
-            {
-                InFile = inFile,
-                Tag = $"{constrDecl}@{it.LineFrom}"
-            };
-            return node;
-        }
-
-        public static TreeNode CreateTreeNode(ClassModel classModel)
-        {
-            return new ClassNode(classModel, PluginUI.GetIcon(classModel.Flags, classModel.Access));
-        }
     }
 
     class ShortcutId

QuickNavigate/SearchUtil.cs

@@ -22,6 +22,7 @@ public static List<string> FindAll([NotNull] List<string> source, [NotNull] stri
         public static List<MemberModel> FindAll([NotNull] List<MemberModel> items, [NotNull] string search)
         {
             var length = search.Length;
+            if (length == 0) return items;
             var result = items.FindAll(it =>
             {
                 var score = PluginCore.Controls.CompletionList.SmartMatch(it.FullName, search, length);