Merge pull request #1993 from Hosch250/cacheBugs

Make Open Project Properties open the properties for the correct proj…

Author: retailcoder

RetailCoder.VBE/Inspections/InspectionResultBase.cs

@@ -121,7 +121,7 @@ public int CompareTo(object obj)
         public object[] ToArray()
         {
             var module = QualifiedSelection.QualifiedName;
-            return new object[] { Inspection.Severity.ToString(), module.ProjectTitle, module.ComponentName, Description, QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.StartColumn };
+            return new object[] { Inspection.Severity.ToString(), module.ProjectName, module.ComponentName, Description, QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.StartColumn };
         }
 
         public string ToCsvString()

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -374,7 +374,8 @@
                                   CommandParameter="{Binding SelectedItem}" />
                         <Separator />
                         <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_OpenProjectProperties}"
-                                  Command="{Binding OpenProjectPropertiesCommand}" />
+                                  Command="{Binding OpenProjectPropertiesCommand}"
+                                  CommandParameter="{Binding SelectedItem}" />
                         <Separator />
                         <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Add}">
                             <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_AddTestModuleText}"

RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_OpenProjectPropertiesCommand.cs

@@ -1,5 +1,7 @@
+using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
 using NLog;
+using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.UI.Command;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
@@ -13,10 +15,36 @@ public CodeExplorer_OpenProjectPropertiesCommand(VBE vbe) : base(LogManager.GetC
             _vbe = vbe;
         }
 
+        protected override bool CanExecuteImpl(object parameter)
+        {
+            return parameter != null || _vbe.VBProjects.Count == 1;
+        }
+
         protected override void ExecuteImpl(object parameter)
         {
             const int openProjectPropertiesId = 2578;
 
+            if (_vbe.VBProjects.Count == 1)
+            {
+                _vbe.CommandBars.FindControl(Id: openProjectPropertiesId).Execute();
+                return;
+            }
+
+            var node = parameter as CodeExplorerItemViewModel;
+            while (!(node is ICodeExplorerDeclarationViewModel))
+            {
+                node = node.Parent; // the project node is an ICodeExplorerDeclarationViewModel--no worries here
+            }
+
+            try
+            {
+                _vbe.ActiveVBProject = node.GetSelectedDeclaration().Project;
+            }
+            catch (COMException)
+            {
+                return; // the project was probably removed from the VBE, but not from the CE
+            }
+
             _vbe.CommandBars.FindControl(Id: openProjectPropertiesId).Execute();
         }
     }

RetailCoder.VBE/UnitTesting/TestMethod.cs

@@ -109,7 +109,7 @@ public NavigateCodeEventArgs GetNavigationArgs()
 
         public object[] ToArray()
         {
-            return new object[] { Declaration.QualifiedName.QualifiedModuleName.ProjectTitle, Declaration.QualifiedName.QualifiedModuleName.ComponentName, Declaration.IdentifierName, 
+            return new object[] { Declaration.QualifiedName.QualifiedModuleName.ProjectName, Declaration.QualifiedName.QualifiedModuleName.ComponentName, Declaration.IdentifierName, 
                 _result.Outcome.ToString(), _result.Output, _result.StartTime.ToString(CultureInfo.InvariantCulture), _result.EndTime.ToString(CultureInfo.InvariantCulture), _result.Duration };
         }
 

Rubberduck.VBEEditor/QualifiedModuleName.cs

@@ -9,22 +9,6 @@ namespace Rubberduck.VBEditor
     /// </summary>
     public struct QualifiedModuleName
     {
-        private static string GetDisplayName(VBProject project)
-        {
-            try
-            {
-                if (project.HelpFile != project.VBE.ActiveVBProject.HelpFile)
-                {
-                    project.VBE.ActiveVBProject = project;
-                }
-                return project.VBE.MainWindow.Caption.Split(' ').Last();
-            }
-            catch
-            {
-                return string.Empty;
-            }
-        }
-
         public static string GetProjectId(VBProject project)
         {
             if (project == null)
@@ -55,7 +39,7 @@ public QualifiedModuleName(VBProject project)
             _projectName = project.Name;
             _projectPath = string.Empty;
             _projectId = GetProjectId(project);
-            _projectDisplayName = GetDisplayName(project);
+            _projectDisplayName = string.Empty;
             _contentHashCode = 0;
         }
 
@@ -67,9 +51,9 @@ public QualifiedModuleName(VBComponent component)
             _componentName = component == null ? string.Empty : component.Name;
             _project = component == null ? null : component.Collection.Parent;
             _projectName = _project == null ? string.Empty : _project.Name;
-            _projectDisplayName = GetDisplayName(_project);
             _projectPath = string.Empty;
             _projectId = GetProjectId(_project);
+            _projectDisplayName = string.Empty;
 
             _contentHashCode = 0;
             if (component == null)
@@ -121,37 +105,40 @@ public QualifiedMemberName QualifyMemberName(string member)
         public string ComponentName { get { return _componentName ?? string.Empty; } }
 
         public string Name { get { return ToString(); } }
-
-        private readonly string _projectDisplayName;
-        public string ProjectDisplayName { get { return _projectDisplayName; } }
 
-        /// <summary>
-        /// returns: "ProjectName (DisplayName)" as typically displayed in VBE Project Explorer
-        /// </summary>
-        public string ProjectTitle
-        {
-            get
-            {
-                return _projectName + (_projectDisplayName != null ? " (" + _projectDisplayName + ")" : string.Empty);
-            }
-        }
-
         private readonly string _projectName;
+        public string ProjectName { get { return _projectName; } }
 
-        public string ProjectName
-        {
-            get
-            {
-                return _projectName;
-            }
-        }
         private readonly string _projectPath;
+        public string ProjectPath { get { return _projectPath; } }
 
-        public string ProjectPath
+        // because this causes a flicker in the VBE, we only want to do it once.
+        // we also want to defer it as long as possible because it is only
+        // needed in a couple places, and QualifiedModuleName is used in many places.
+        private string _projectDisplayName;
+        public string ProjectDisplayName
         {
             get
             {
-                return _projectPath;
+                if (_projectDisplayName != string.Empty)
+                {
+                    return _projectDisplayName;
+                }
+
+                try
+                {
+                    if (_project.HelpFile != _project.VBE.ActiveVBProject.HelpFile)
+                    {
+                        _project.VBE.ActiveVBProject = _project;
+                    }
+
+                    _projectDisplayName = _project.VBE.MainWindow.Caption.Split(' ').Last();
+                    return _projectDisplayName;
+                }
+                catch
+                {
+                    return string.Empty;
+                }
             }
         }