Merge branch 'feature/146' into develop

Author: SlavaRa

QuickNavigate/Forms/Nodes.cs

@@ -43,6 +43,15 @@ public TypeNode([NotNull] ClassModel model, int imageIndex, int selectedImageInd
         }
     }
 
+    public class MemberNode : TreeNode
+    {
+        public FileModel InFile;
+
+        public MemberNode(string text, int imageIndex, int selectedImageIndex) : base(text, imageIndex, selectedImageIndex)
+        {
+        }
+    }
+
     class ClassHierarchyNode : TypeNode
     {
         public ClassHierarchyNode(ClassModel model, int imageIndex, int selectedImageIndex)

QuickNavigate/Forms/TypeExplorerForm.cs

@@ -133,53 +133,99 @@ void InitializeTheme()
 
         void RefreshTree()
         {
+            var search = input.Text.Trim();
+            TypeNode selectedNode = null;
+            if (search.Length > 1 && search.Contains('.') && tree.Nodes.Count > 0)
+            {
+                var node = SelectedNode as TypeNode ?? (TypeNode)tree.Nodes[0];
+                var parts = search.Split('.');
+                if (node.Name == parts[0])
+                {
+                    selectedNode = node;
+                    search = parts[1];
+                }
+            }
             tree.BeginUpdate();
             tree.Nodes.Clear();
-            FillTree();
+            if (selectedNode == null)
+            {
+                if (search.Length == 0) FillTree();
+                else FillTree(search);
+                if (tree.Nodes.Count > 0) tree.SelectedNode = tree.Nodes[0];
+            }
+            else
+            {
+                selectedNode.Nodes.Clear();
+                tree.Nodes.Add(selectedNode);
+                FillTree(selectedNode, search);
+                tree.SelectedNode = selectedNode.FirstNode ?? selectedNode;
+            }
             tree.ExpandAll();
             tree.EndUpdate();
         }
 
         void FillTree()
         {
-            var search = input.Text.Trim();
-            var openedTypes = this.openedTypes.ToList();
-            var closedTypes = this.closedTypes.ToList();
-            if (CurrentFilter != null)
+            var openedTypes = FilterTypes(this.openedTypes.ToList());
+            if (openedTypes.Count > 0) tree.Nodes.AddRange(CreateNodes(openedTypes, string.Empty).ToArray());
+        }
+
+        void FillTree(string search)
+        {
+            var openedTypes = FilterTypes(this.openedTypes.ToList());
+            var closedTypes = FilterTypes(this.closedTypes.ToList());
+            var maxItems = Settings.MaxItems;
+            var openedMatches = openedTypes.Count > 0 ? SearchUtil.FindAll(openedTypes, search) : new List<string>();
+            var closedMatches = new List<string>();
+            if (maxItems > 0)
             {
-                var flags = (FlagType)CurrentFilter.Tag;
-                openedTypes.RemoveAll(it => (TypeToClassModel[it].Flags & flags) == 0);
-                closedTypes.RemoveAll(it => (TypeToClassModel[it].Flags & flags) == 0);
+                if (openedMatches.Count >= maxItems) openedMatches = openedMatches.GetRange(0, maxItems);
+                maxItems -= openedMatches.Count;
+                if (maxItems > 0)
+                {
+                    closedMatches = SearchUtil.FindAll(closedTypes, search);
+                    if (closedMatches.Count >= maxItems) closedMatches = closedMatches.GetRange(0, maxItems);
+                }
             }
-            var openedCount = openedTypes.Count;
-            if (search.Length == 0)
+            else closedMatches = SearchUtil.FindAll(closedTypes, search);
+            var hasOpenedMatches = openedMatches.Count > 0;
+            var hasClosedMatches = closedMatches.Count > 0;
+            if (hasOpenedMatches) tree.Nodes.AddRange(CreateNodes(openedMatches, search).ToArray());
+            if (Settings.EnableItemSpacer && hasOpenedMatches && hasClosedMatches)
+                tree.Nodes.Add(Settings.ItemSpacer);
+            if (hasClosedMatches) tree.Nodes.AddRange(CreateNodes(closedMatches, search).ToArray());
+        }
+
+        void FillTree(TypeNode node, string search)
+        {
+            var nodes = node.Nodes;
+            var currentClass = node.Model;
+            var inFile = currentClass.InFile;
+            var isHaxe = inFile.haXe;
+            var items = currentClass.Members.Items.ToList();
+            if (search.Length > 0) items = SearchUtil.FindAll(items, search);
+            foreach (var it in items)
             {
-                if (openedCount > 0) tree.Nodes.AddRange(CreateNodes(openedTypes, string.Empty).ToArray());
+                var flags = it.Flags;
+                var icon = PluginUI.GetIcon(flags, it.Access);
+                var constrDecl = isHaxe && (flags & FlagType.Constructor) > 0 ? "new" : it.FullName;
+                nodes.Add(new MemberNode(it.ToString(), icon, icon)
+                {
+                    Tag = $"{constrDecl}@{it.LineFrom}",
+                    InFile = inFile
+                });
             }
-            else
+        }
+
+        [NotNull]
+        List<string> FilterTypes(List<string> list)
+        {
+            if (CurrentFilter != null)
             {
-                var maxItems = Settings.MaxItems;
-                var openedMatches = openedCount > 0 ? SearchUtil.FindAll(openedTypes, search) : new List<string>();
-                var closedMatches = new List<string>();
-                if (maxItems > 0)
-                {
-                    if (openedMatches.Count >= maxItems) openedMatches = openedMatches.GetRange(0, maxItems);
-                    maxItems -= openedMatches.Count;
-                    if (maxItems > 0)
-                    {
-                        closedMatches = SearchUtil.FindAll(closedTypes, search);
-                        if (closedMatches.Count >= maxItems) closedMatches = closedMatches.GetRange(0, maxItems);
-                    }
-                }
-                else closedMatches = SearchUtil.FindAll(closedTypes, search);
-                var hasOpenedMatches = openedMatches.Count > 0;
-                var hasClosedMatches = closedMatches.Count > 0;
-                if (hasOpenedMatches) tree.Nodes.AddRange(CreateNodes(openedMatches, search).ToArray());
-                if (Settings.EnableItemSpacer && hasOpenedMatches && hasClosedMatches)
-                    tree.Nodes.Add(Settings.ItemSpacer);
-                if (hasClosedMatches) tree.Nodes.AddRange(CreateNodes(closedMatches, search).ToArray());
+                var flags = (FlagType) CurrentFilter.Tag;
+                list.RemoveAll(it => (TypeToClassModel[it].Flags & flags) == 0);
             }
-            if (tree.Nodes.Count > 0) tree.SelectedNode = tree.Nodes[0];
+            return list;
         }
 
         [NotNull]
@@ -412,6 +458,13 @@ void OnInputKeyDown(object sender, KeyEventArgs e)
         {
             if (tree.Nodes.Count == 0) return;
             var keyCode = e.KeyCode;
+            if (e.Control && keyCode == Keys.Right && SelectedNode is TypeNode)
+            {
+                e.Handled = true;
+                input.Text = ((TypeNode) SelectedNode).Model.Name;
+                input.SelectionStart = input.TextLength;
+                return;
+            }
             if (keysToFilter.ContainsKey(keyCode))
             {
                 e.Handled = e.Alt;

QuickNavigate/Helpers/FormHelper.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Security.Permissions;
 using System.Windows.Forms;
 using ASCompletion;
 using ASCompletion.Context;
@@ -91,7 +92,12 @@ public static void Navigate([NotNull] string fileName, [NotNull] TreeNode node)
             Navigate(node);
         }
 
-        public static void Navigate([NotNull] TreeNode node) => ASContext.Context.OnSelectOutlineNode(node);
+        public static void Navigate([NotNull] TreeNode node)
+        {
+            if (node is TypeNode) ModelsExplorer.Instance.OpenFile(((TypeNode) node).Model.InFile.FileName);
+            else if (node is MemberNode) ModelsExplorer.Instance.OpenFile(((MemberNode) node).InFile.FileName);
+            ASContext.Context.OnSelectOutlineNode(node);
+        }
 
         public const string ProjectManagerGUID = "30018864-fadd-1122-b2a5-779832cbbf23";
 

QuickNavigate/PluginMain.cs

@@ -261,9 +261,8 @@ void ShowTypeExplorer()
             form.Shown += OnFormShown;
             form.Closing += OnFormClosing;
             if (form.ShowDialog() != DialogResult.OK) return;
-            var node = form.SelectedNode as TypeNode;
-            if (node == null) return;
-            FormHelper.Navigate(node.Model.InFile.FileName, node);
+            var node = form.SelectedNode;
+            if (node != null) FormHelper.Navigate(node);
         }
 
         void ShowQuickOutline(object sender, EventArgs e) => ShowQuickOutline();

README.md

@@ -21,6 +21,12 @@ Open Search in the topmenu.
 Shortcut: QuickNavigate.TypeExplorer
 ![image](https://dl.dropboxusercontent.com/u/63456010/GitHub/QuickNavigate/TypeExplorer.gif)
 
+Synchronize input field with selected type, shortcut: ctrl+right
+![image](https://dl.dropboxusercontent.com/u/63456010/GitHub/QuickNavigate/TypeExplorerSyncWithSelectedType.gif)
+
+Outline mode<br/>
+![image](https://dl.dropboxusercontent.com/u/63456010/GitHub/QuickNavigate/TypeExplorer.Outline.gif)
+
 ##### 2. Quick Outline
 Shortcut: QuickNavigate.Outline
 ![image](https://dl.dropboxusercontent.com/u/63456010/GitHub/QuickNavigate/QuickOutlineForm.gif)

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 environment:
   ID: quicknavigate
-  PLUGIN_VERSION: 2.8
+  PLUGIN_VERSION: 2.9
   PLUGIN_NAME: QuickNavigate
   PLUGIN_DESC: Quickly navigate through Types, Fields, Projects and more
   PLUGIN_PATH: C:\projects\FlashDevelop\External\Plugins\QuickNavigate