Merge pull request #140 from rubberduck-vba/next

sync with main repo

Author: retailcoder

RetailCoder.VBE/API/ParserState.cs

@@ -78,7 +78,7 @@ public void Initialize(VBE vbe)
         public void Parse()
         {
             // blocking call
-            _parser.Parse();
+            _parser.Parse(new System.Threading.CancellationTokenSource());
         }
 
         /// <summary>

RetailCoder.VBE/App.cs

@@ -11,7 +11,6 @@
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Globalization;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Rubberduck
@@ -141,7 +140,6 @@ public void Startup()
             _appMenus.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
-            Task.Delay(1000).ContinueWith(t => UiDispatcher.Invoke(() => _parser.State.OnParseRequested(this)));
             UpdateLoggingLevel();
         }
 
@@ -157,168 +155,6 @@ public void Shutdown()
             }
         }
 
-        /*#region sink handlers.
-        async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
-                return;
-            }
-
-            _parser.Cancel();
-
-            var projectId = e.Item.HelpFile;
-            Debug.Assert(projectId != null);
-
-            _parser.State.RemoveProject(e.Item);
-            _parser.State.OnParseRequested(this);
-        }
-
-        async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            Logger.Debug("Project '{0}' was added.", e.Item.Name);
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Project is protected and will not be added to parser state.");
-                return;
-            }
-
-            _parser.State.AddProject(e.Item); // note side-effect: assigns ProjectId/HelpFile
-            var projectId = e.Item.HelpFile;
-            RegisterComponentsEventSink(e.Item.VBComponents, projectId);
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                // forces menus to evaluate their CanExecute state:
-                Parser_StateChanged(this, new ParserStateEventArgs(ParserState.Pending));
-                _stateBar.SetStatusText();
-                return;
-            }
-
-            _parser.State.OnParseRequested(sender);
-        }
-
-        async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-        }
-
-        async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel();
-
-            _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
-
-            Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
-            
-            var projectId = e.Item.Collection.Parent.HelpFile;
-            var componentDeclaration = _parser.State.AllDeclarations.FirstOrDefault(f =>
-                        f.ProjectId == projectId &&
-                        f.DeclarationType == DeclarationType.ClassModule &&
-                        f.IdentifierName == e.OldName);
-
-            if (e.Item.Type == vbext_ComponentType.vbext_ct_Document &&
-                componentDeclaration != null &&
-
-                // according to ThunderFrame, Excel is the only one we explicitly support
-                // with two Document-component types just skip the Worksheet component
-                ((ClassModuleDeclaration) componentDeclaration).Supertypes.All(a => a.IdentifierName != "Worksheet"))
-            {
-                _parser.State.RemoveProject(projectId);
-
-                _parser.State.AddProject(e.Item.Collection.Parent);
-            }
-            else
-            {
-                _parser.State.RemoveRenamedComponent(e.Item, e.OldName);
-            }
-
-            _parser.State.OnParseRequested(this);
-        }
-
-        async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel(e.Item);
-
-            _sourceControlPanelVM.HandleRemovedComponent(e.Item);
-
-            Logger.Debug("Component '{0}' was removed.", e.Item.Name);
-            _parser.State.ClearStateCache(e.Item, true);
-        }
-
-        async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel(e.Item);
-            
-            _parser.State.OnParseRequested(sender, e.Item);
-        }
-
-        async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _sourceControlPanelVM.HandleAddedComponent(e.Item);
-
-            Logger.Debug("Component '{0}' was added.", e.Item.Name);
-            _parser.State.OnParseRequested(sender, e.Item);
-        }
-
-        async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel();
-
-            Logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
-
-            _parser.State.RemoveProject(e.Item.HelpFile);
-            _parser.State.AddProject(e.Item);
-
-            _parser.State.OnParseRequested(sender);
-        }
-        #endregion*/
-
         private void _stateBar_Refresh(object sender, EventArgs e)
         {
             // handles "refresh" button click on "Rubberduck" command bar

RetailCoder.VBE/Extension.cs

@@ -6,12 +6,16 @@
 using Rubberduck.UI;
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using System.Windows.Threading;
 using Ninject.Extensions.Interception;
 using NLog;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 
 namespace Rubberduck
 {
@@ -46,6 +50,24 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
             {
                 var currentDomain = AppDomain.CurrentDomain;
                 currentDomain.AssemblyResolve += LoadFromSameFolder;
+
+                var config = new XmlPersistanceService<GeneralSettings>
+                {
+                    FilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Rubberduck",
+                            "rubberduck.config")
+                };
+
+                var settings = config.Load(null);
+                if (settings != null)
+                {
+                    try
+                    {
+                        var cultureInfo = CultureInfo.GetCultureInfo(settings.Language.Code);
+                        Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = cultureInfo;
+                    }
+                    catch (CultureNotFoundException) { }
+                }
+
                 _kernel.Load(new RubberduckModule((VBE)Application, (AddIn)AddInInst));
                 _app = _kernel.Get<App>();
                 _app.Startup();

RetailCoder.VBE/Inspections/SelfAssignedDeclarationInspection.cs

@@ -39,6 +39,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                     && declaration.IsTypeSpecified
                     && !ValueTypes.Contains(declaration.AsTypeName)
                     && declaration.DeclarationType == DeclarationType.Variable
+                    && declaration.AsTypeDeclaration.DeclarationType != DeclarationType.UserDefinedType
                     && declaration.ParentScopeDeclaration != null
                     && declaration.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member))
                 .Select(issue => new SelfAssignedDeclarationInspectionResult(this, issue));

RetailCoder.VBE/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.2.*")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyVersion("2.0.4.*")]
+[assembly: AssemblyFileVersion("2.0.4.0")]

RetailCoder.VBE/Rubberduck.csproj

@@ -850,6 +850,11 @@
       <DependentUpon>SettingsView.xaml</DependentUpon>
     </Compile>
     <Compile Include="UI\SourceControl\SettingsViewViewModel.cs" />
+    <Compile Include="UI\SourceControl\SourceControl.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>SourceControl.resx</DependentUpon>
+    </Compile>
     <Compile Include="UI\SourceControl\SourceControlPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -1066,6 +1071,10 @@
       <SubType>Designer</SubType>
       <LastGenOutput>RubberduckUI.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="UI\SourceControl\SourceControl.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>SourceControl.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="UI\SourceControl\SourceControlPanel.resx">
       <DependentUpon>SourceControlPanel.cs</DependentUpon>
     </EmbeddedResource>

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -696,7 +696,7 @@
                                   IsCheckable="True" />
                     </MenuItem>
                 </Menu>
-                <ToggleButton Name="DisplaySignatures" IsEnabled="{Binding CanRefresh}" ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ShowSignaturesToolTip}" IsChecked="True">
+                <ToggleButton Name="DisplaySignatures" ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ShowSignaturesToolTip}" IsChecked="True">
                     <Image Height="16" Source="../../Resources/Custom/PNG/DisplayFullSignature.png" />
                 </ToggleButton>
 

RetailCoder.VBE/UI/Command/MenuItems/AddTestMethodCommandMenuItem.cs

@@ -12,7 +12,7 @@ public AddTestMethodCommandMenuItem(CommandBase command)
         {
         }
 
-        public override string Key { get { return "TestExplorer_AddTestMethod"; } }
+        public override string Key { get { return "TestExplorerMenu_AddTestMethod"; } }
         public override int DisplayOrder { get { return (int)UnitTestingMenuItemDisplayOrder.AddTestMethod; } }
 
         public override Image Image { get { return Resources.flask; } }

RetailCoder.VBE/UI/Command/MenuItems/AddTestMethodExpectedErrorCommandMenuItem.cs

@@ -12,7 +12,7 @@ public AddTestMethodExpectedErrorCommandMenuItem(CommandBase command)
         {
         }
 
-        public override string Key { get { return "TestExplorer_AddExpectedErrorTestMethod"; } }
+        public override string Key { get { return "TestExplorerMenu_AddExpectedErrorTestMethod"; } }
         public override int DisplayOrder { get { return (int)UnitTestingMenuItemDisplayOrder.AddTestMethodExpectedError; } }
 
         public override Image Image { get { return Resources.flask_exclamation; } }

RetailCoder.VBE/UI/Command/MenuItems/AddTestModuleCommandMenuItem.cs

@@ -10,7 +10,7 @@ public AddTestModuleCommandMenuItem(CommandBase command)
         {
         }
 
-        public override string Key { get { return "TestExplorer_AddTestModule"; } }
+        public override string Key { get { return "TestExplorerMenu_AddTestModule"; } }
         public override int DisplayOrder { get { return (int)UnitTestingMenuItemDisplayOrder.AddTestModule; } }
         public override bool BeginGroup { get { return true; } }
     }