Close #1519 (#1534)

Author: Hosch250

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

@@ -47,7 +47,53 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
                                 .OrderBy(item => item.QualifiedSelection.Selection.StartLine)
                                 .Select(item => new CodeExplorerMemberViewModel(this, item, grouping)))
                                 .ToList<CodeExplorerItemViewModel>();
-            
+
+            _name = _declaration.IdentifierName;
+
+            var component = declaration.QualifiedName.QualifiedModuleName.Component;
+            if (component.Type == vbext_ComponentType.vbext_ct_Document)
+            {
+                try
+                {
+                    var parenthesizedName = component.Properties.Item("Name").Value.ToString();
+
+                    if (ContainsBuiltinDocumentPropertiesProperty())
+                    {
+                        CodeExplorerItemViewModel node = this;
+                        while (node.Parent != null)
+                        {
+                            node = node.Parent;
+                        }
+
+                        ((CodeExplorerProjectViewModel) node).SetParenthesizedName(parenthesizedName);
+                    }
+                    else
+                    {
+                        _name += " (" + parenthesizedName + ")";
+                    }
+                }
+                catch
+                {
+                    // gotcha! (this means that the property either doesn't exist or we weren't able to get it for some reason)
+                }
+            }
+        }
+
+        private bool ContainsBuiltinDocumentPropertiesProperty()
+        {
+            var component = _declaration.QualifiedName.QualifiedModuleName.Component;
+
+            try
+            {
+                component.Properties.Item("BuiltinDocumentProperties");
+            }
+            catch
+            {
+                // gotcha! (this means that the property either doesn't exist or we weren't able to get it for some reason)
+                return false;
+            }
+
+            return true;
         }
 
         private bool _isErrorState;
@@ -62,8 +108,9 @@ public bool IsTestModule
             }
         }
 
-        public override string Name { get { return _declaration.IdentifierName; } }
-        public override string NameWithSignature { get { return Name; } }
+        private readonly string _name;
+        public override string Name { get { return _name; } }
+        public override string NameWithSignature { get { return _name; } }
 
         public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
 

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs

@@ -27,6 +27,7 @@ public class CodeExplorerProjectViewModel : CodeExplorerItemViewModel, ICodeExpl
         public CodeExplorerProjectViewModel(FolderHelper folderHelper, Declaration declaration, IEnumerable<Declaration> declarations)
         {
             _declaration = declaration;
+            _name = _declaration.IdentifierName;
             IsExpanded = true;
             _folderTree = folderHelper.GetFolderTree(declaration);
 
@@ -43,11 +44,6 @@ public CodeExplorerProjectViewModel(FolderHelper folderHelper, Declaration decla
             {
                 Console.WriteLine(e);
             }
-
-            foreach (var folder in _folderTree.Items.OfType<CodeExplorerCustomFolderViewModel>())
-            {
-                folder.SetParent(this);
-            }
         }
 
         private void FillFolders(IEnumerable<Declaration> declarations)
@@ -72,6 +68,11 @@ private bool AddNodesToTree(CodeExplorerCustomFolderViewModel tree, List<Declara
                     continue;
                 }
 
+                if (folder.Parent.Name == string.Empty)
+                {
+                    folder.SetParent(this);
+                }
+
                 var parents = grouping.Where(
                         item => ComponentTypes.Contains(item.DeclarationType) &&
                             item.CustomFolder.Replace("\"", string.Empty) == folder.FullPath)
@@ -94,8 +95,14 @@ private bool AddNodesToTree(CodeExplorerCustomFolderViewModel tree, List<Declara
         // projects are always at the top of the tree
         public override CodeExplorerItemViewModel Parent { get { return null; } }
 
-        public override string Name { get { return _declaration.IdentifierName; } }
-        public override string NameWithSignature { get { return Name; } }
+        private string _name;
+        public override string Name { get { return _name; } }
+        public override string NameWithSignature { get { return _name; } }
         public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
+
+        public void SetParenthesizedName(string parenthesizedName)
+        {
+            _name += " (" + parenthesizedName + ")";
+        }
     }
 }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Input;
 using System.Windows.Threading;
+using Microsoft.Vbe.Interop;
 using Rubberduck.Navigation.Folders;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
@@ -218,7 +219,7 @@ private void ParserState_StateChanged(object sender, EventArgs e)
             {
                 return;
             }
-
+            
             var userDeclarations = _state.AllUserDeclarations
                 .GroupBy(declaration => declaration.Project)
                 .Where(grouping => grouping.Key != null)
@@ -230,6 +231,9 @@ private void ParserState_StateChanged(object sender, EventArgs e)
                 return;
             }
 
+
+            var components = userDeclarations.SelectMany(s => s.Key.VBComponents.Cast<VBComponent>()).FirstOrDefault(s => s.Name == "asdf");
+
             var newProjects = userDeclarations.Select(grouping =>
                 new CodeExplorerProjectViewModel(_folderHelper,
                     grouping.SingleOrDefault(declaration => declaration.DeclarationType == DeclarationType.Project),