Merge pull request #184 from rubberduck-vba/next

sync with main repo

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -1,6 +1,9 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using Infralution.Localization.Wpf;
 using NLog;
+using NLog.Fluent;
 using Rubberduck.Common;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Symbols;
@@ -145,6 +148,7 @@ private void UpdateLoggingLevel()
         public void Startup()
         {
             EnsureLogFolderPathExists();
+            LogRubberduckSart();
             LoadConfig();
             CheckForLegacyIndenterSettings();
             _appMenus.Initialize();
@@ -223,6 +227,21 @@ private void CheckForLegacyIndenterSettings()
             }
         }
 
+        private void LogRubberduckSart()
+        {
+            var version = GetType().Assembly.GetName().Version.ToString();
+            GlobalDiagnosticsContext.Set("RubberduckVersion", version);
+            var headers = new List<string>
+            {
+                string.Format("Rubberduck version {0} loading:", version),
+                string.Format("\tOperating System: {0} {1}", Environment.OSVersion.VersionString, Environment.Is64BitOperatingSystem ? "x64" : "x86"),
+                string.Format("\tHost Product: {0} {1}", Application.ProductName, Environment.Is64BitProcess ? "x64" : "x86"),
+                string.Format("\tHost Version: {0}", Application.ProductVersion),
+                string.Format("\tHost Executable: {0}", Path.GetFileName(Application.ExecutablePath)),
+            };
+            Logger.Log(LogLevel.Info, string.Join(Environment.NewLine, headers));
+        }
+
         private bool _disposed;
         public void Dispose()
         {

RetailCoder.VBE/Inspections/UnassignedVariableUsageInspection.cs

@@ -30,8 +30,9 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 && !declaration.IsSelfAssigned
                 && !declaration.References.Any(reference => reference.IsAssignment));
 
-            var lenFunction = BuiltInDeclarations.SingleOrDefault(s => s.Scope == "VBE7.DLL;VBA.Strings.Len");
-            var lenbFunction = BuiltInDeclarations.SingleOrDefault(s => s.Scope == "VBE7.DLL;VBA.Strings.LenB");
+            //The parameter scoping was apparently incorrect before - need to filter for the actual function.
+            var lenFunction = BuiltInDeclarations.SingleOrDefault(s => s.DeclarationType == DeclarationType.Function && s.Scope.Equals("VBE7.DLL;VBA.Strings.Len"));
+            var lenbFunction = BuiltInDeclarations.SingleOrDefault(s => s.DeclarationType == DeclarationType.Function && s.Scope.Equals("VBE7.DLL;VBA.Strings.Len"));
 
             return from issue in declarations 
                    where issue.References.Any()

RetailCoder.VBE/NLog.dll.nlog

@@ -7,7 +7,7 @@
       xsi:type="File" 
       name="file"
       fileName="${specialfolder:folder=ApplicationData}/Rubberduck/Logs/RubberduckLog.txt"
-      layout="${longdate};${uppercase:${level}};${logger};${message};${exception:format=tostring}"
+      layout="${longdate};${uppercase:${level}}-${gdc:item=RubberduckVersion};${logger};${message};${exception:format=tostring}"
       archiveFileName="${specialfolder:folder=ApplicationData}/Rubberduck/Logs/archives/RubberduckLog.{#}.txt"
       archiveAboveSize="5242880"
       archiveNumbering="Sequence"

RetailCoder.VBE/Settings/WindowSettings.cs

@@ -1,4 +1,11 @@
 using System.Xml.Serialization;
+using Rubberduck.Properties;
+using Rubberduck.UI;
+using Rubberduck.UI.CodeExplorer;
+using Rubberduck.UI.Inspections;
+using Rubberduck.UI.SourceControl;
+using Rubberduck.UI.ToDoItems;
+using Rubberduck.UI.UnitTesting;
 
 namespace Rubberduck.Settings
 {
@@ -9,6 +16,8 @@ public interface IWindowSettings
         bool SourceControlVisibleOnStartup { get; set; }
         bool TestExplorerVisibleOnStartup { get; set; }
         bool TodoExplorerVisibleOnStartup { get; set; }
+
+        bool IsWindowVisible(DockableToolwindowPresenter candidate);
     }
 
     [XmlType(AnonymousType = true)]
@@ -34,5 +43,33 @@ public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVis
         public bool SourceControlVisibleOnStartup { get; set; }
         public bool TestExplorerVisibleOnStartup { get; set; }
         public bool TodoExplorerVisibleOnStartup { get; set; }
+
+        public bool IsWindowVisible(DockableToolwindowPresenter candidate)
+        {
+            //I'm sure there's a better way to do this, because this is a lazy-ass way to do it.
+            //We're injecting into the base class, so check the derived class:
+            if (candidate is CodeExplorerDockablePresenter)
+            {
+                return CodeExplorerVisibleOnStartup;
+            }
+            if (candidate is CodeInspectionsDockablePresenter)
+            {
+                return CodeInspectionsVisibleOnStartup;
+            }
+            if (candidate is SourceControlDockablePresenter)
+            {
+                return SourceControlVisibleOnStartup;
+            }
+            if (candidate is TestExplorerDockablePresenter)
+            {
+                return TestExplorerVisibleOnStartup;
+            }
+            if (candidate is ToDoExplorerDockablePresenter)
+            {
+                return TodoExplorerVisibleOnStartup;
+            }
+            //Oh. Hello. I have no clue who you are...
+            return false;
+        }
     }
 }

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs

@@ -1,11 +1,13 @@
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.CodeExplorer
 {
     public class CodeExplorerDockablePresenter : DockableToolwindowPresenter
     {
-        public CodeExplorerDockablePresenter(IVBE vbe, IAddIn addIn, CodeExplorerWindow view)
-            : base(vbe, addIn, view)
+        public CodeExplorerDockablePresenter(IVBE vbe, IAddIn addIn, CodeExplorerWindow view, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addIn, view, settings)
         {
         }
     }

RetailCoder.VBE/UI/Controls/SearchResultsDockablePresenter.cs

@@ -4,8 +4,8 @@ namespace Rubberduck.UI.Controls
 {
     public class SearchResultsDockablePresenter : DockableToolwindowPresenter
     {
-        public SearchResultsDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl view) 
-            : base(vbe, addin, view)
+        public SearchResultsDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl view)
+            : base(vbe, addin, view, null)
         {
         }
 

RetailCoder.VBE/UI/DockableToolwindowPresenter.cs

@@ -1,7 +1,10 @@
 using System;
+using System.Configuration;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using NLog;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI
@@ -23,13 +26,18 @@ public abstract class DockableToolwindowPresenter : IDockablePresenter, IDisposa
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private readonly IWindow _window;
         private readonly UserControl _userControl;
+        private readonly WindowSettings _settings;  //Storing this really doesn't matter - it's only checked on startup and never persisted.
 
-        protected DockableToolwindowPresenter(IVBE vbe, IAddIn addin, IDockableUserControl view)
+        protected DockableToolwindowPresenter(IVBE vbe, IAddIn addin, IDockableUserControl view, IConfigProvider<WindowSettings> settingsProvider)
         {
             _vbe = vbe;
             _addin = addin;
             Logger.Trace(string.Format("Initializing Dockable Panel ({0})", GetType().Name));
             _userControl = view as UserControl;
+            if (settingsProvider != null)
+            {
+                _settings = settingsProvider.Create();
+            }
             _window = CreateToolWindow(view);
         }
 
@@ -69,7 +77,7 @@ private IWindow CreateToolWindow(IDockableUserControl control)
 
             EnsureMinimumWindowSize(toolWindow);
 
-            toolWindow.IsVisible = false; //hide it again
+            toolWindow.IsVisible = _settings != null && _settings.IsWindowVisible(this);
 
             userControlHost.AddUserControl(control as UserControl, new IntPtr(_vbe.MainWindow.HWnd));
             return toolWindow;

RetailCoder.VBE/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs

@@ -7,7 +7,7 @@ namespace Rubberduck.UI.IdentifierReferences
     public class IdentifierReferencesListDockablePresenter : DockableToolwindowPresenter
     {
         public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, Declaration target)
-            : base(vbe, addin, control)
+            : base(vbe, addin, control, null)
         {
             BindTarget(target);
         }

RetailCoder.VBE/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs

@@ -9,7 +9,7 @@ namespace Rubberduck.UI.IdentifierReferences
     public class ImplementationsListDockablePresenter : DockableToolwindowPresenter
     {
         public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, IEnumerable<Declaration> implementations)
-            : base(vbe, addin, control)
+            : base(vbe, addin, control, null)
         {
             BindTarget(implementations);
         }

RetailCoder.VBE/UI/Inspections/CodeInspectionsDockablePresenter.cs

@@ -1,11 +1,13 @@
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Inspections
 {
     public class CodeInspectionsDockablePresenter : DockableToolwindowPresenter
     {
-        public CodeInspectionsDockablePresenter(IVBE vbe, IAddIn addin, CodeInspectionsWindow window)
-            :base(vbe, addin, window)
+        public CodeInspectionsDockablePresenter(IVBE vbe, IAddIn addin, CodeInspectionsWindow window, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addin, window, settings)
         {
         }
     }