Merge pull request #2392 from retailcoder/next

retailcoder · web-flow · commit a52afc54eff0 · 2016-11-30T23:12:02.000-05:00
some cleanups
diff --git a/RetailCoder.VBE/Common/ExportFormatter.cs b/RetailCoder.VBE/Common/ExportFormatter.cs
@@ -43,14 +43,12 @@ public ColumnInfo(string Title, hAlignment HorizontalAlignment = hAlignment.Left
 
     public static class ExportFormatter
     {
-        public static string Csv(object[][] data, string Title, ColumnInfo[] ColumnInfos)
+        public static string Csv(object[][] data, string title, ColumnInfo[] columnInfos)
         {
-            string s = "";
-
-            string[] headerRow = new string[ColumnInfos.Length];
-            for (var c = 0; c < ColumnInfos.Length; c++)
+            var headerRow = new string[columnInfos.Length];
+            for (var c = 0; c < columnInfos.Length; c++)
             {
-                headerRow[c] = CsvEncode(ColumnInfos[c].Title);
+                headerRow[c] = CsvEncode(columnInfos[c].Title);
             }
 
             string[] rows = new string[data.Length];
@@ -63,7 +61,7 @@ public static string Csv(object[][] data, string Title, ColumnInfo[] ColumnInfos
                 }
                 rows[r] = string.Join(",", row);
             }
-            return CsvEncode(Title.Replace("\r\n"," ")) + Environment.NewLine + string.Join(",", headerRow) + Environment.NewLine + string.Join(Environment.NewLine, rows);
+            return CsvEncode(title.Replace("\r\n"," ")) + Environment.NewLine + string.Join(",", headerRow) + Environment.NewLine + string.Join(Environment.NewLine, rows);
         }
 
         private static string CsvEncode(object value)
diff --git a/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs b/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs
@@ -13,7 +13,6 @@ namespace Rubberduck.Navigation.RegexSearchReplace
 {
     public class RegexSearchReplace : IRegexSearchReplace
     {
-        private readonly RegexSearchReplaceModel _model;
         private readonly IVBE _vbe;
         private readonly IRubberduckParser _parser;
 
diff --git a/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplacePresenter.cs b/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplacePresenter.cs
@@ -6,65 +6,65 @@
 
 namespace Rubberduck.Navigation.RegexSearchReplace
 {
-    public class RegexSearchReplacePresenter : IPresenter
+    public class RegexSearchReplacePresenter //: IPresenter
     {
-        private readonly IVBE _vbe;
-        private readonly IRegexSearchReplaceDialog _view;
-        private readonly IRubberduckParser _parser;
+        //private readonly IVBE _vbe;
+        //private readonly IRegexSearchReplaceDialog _view;
+        //private readonly IRubberduckParser _parser;
 
-        public RegexSearchReplacePresenter(IVBE vbe, IRubberduckParser parser/*, IRegexSearchReplaceDialog view*/)
-        {
-            _vbe = vbe;
-            //_view = view;
-            _parser = parser;
+        //public RegexSearchReplacePresenter(IVBE vbe, IRubberduckParser parser/*, IRegexSearchReplaceDialog view*/)
+        //{
+        //    _vbe = vbe;
+        //    _view = view;
+        //    _parser = parser;
 
-            //_view.FindButtonClicked += _view_FindButtonClicked;
-            //_view.ReplaceButtonClicked += _view_ReplaceButtonClicked;
-            //_view.ReplaceAllButtonClicked += _view_ReplaceAllButtonClicked;
-            //_view.CancelButtonClicked += _view_CancelButtonClicked;
-        }
+        //    _view.FindButtonClicked += _view_FindButtonClicked;
+        //    _view.ReplaceButtonClicked += _view_ReplaceButtonClicked;
+        //    _view.ReplaceAllButtonClicked += _view_ReplaceAllButtonClicked;
+        //    _view.CancelButtonClicked += _view_CancelButtonClicked;
+        //}
 
-        public void Show()
-        {
-            //_view.ShowDialog();
-        }
+        //public void Show()
+        //{
+        //    _view.ShowDialog();
+        //}
 
-        public void Hide()
-        {
-            //_view.Close();
-        }
+        //public void Hide()
+        //{
+        //    _view.Close();
+        //}
 
-        public event EventHandler<IEnumerable<RegexSearchResult>> FindButtonResults;
-        protected virtual void OnFindButtonResults(IEnumerable<RegexSearchResult> results)
-        {
-            var handler = FindButtonResults;
-            if (handler != null)
-            {
-                handler(this, results);
-            }
-        }
+        //public event EventHandler<IEnumerable<RegexSearchResult>> FindButtonResults;
+        //protected virtual void OnFindButtonResults(IEnumerable<RegexSearchResult> results)
+        //{
+        //    var handler = FindButtonResults;
+        //    if (handler != null)
+        //    {
+        //        handler(this, results);
+        //    }
+        //}
 
-        private void _view_FindButtonClicked(object sender, EventArgs e)
-        {
-            var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
-            OnFindButtonResults(regexSearchReplace.Search(_view.SearchPattern, _view.Scope));
-        }
+        //private void _view_FindButtonClicked(object sender, EventArgs e)
+        //{
+        //    var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
+        //    OnFindButtonResults(regexSearchReplace.Search(_view.SearchPattern, _view.Scope));
+        //}
 
-        private void _view_ReplaceButtonClicked(object sender, EventArgs e)
-        {
-            var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
-            regexSearchReplace.Replace(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
-        }
+        //private void _view_ReplaceButtonClicked(object sender, EventArgs e)
+        //{
+        //    var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
+        //    regexSearchReplace.Replace(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
+        //}
 
-        private void _view_ReplaceAllButtonClicked(object sender, EventArgs e)
-        {
-            var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
-            regexSearchReplace.ReplaceAll(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
-        }
+        //private void _view_ReplaceAllButtonClicked(object sender, EventArgs e)
+        //{
+        //    var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
+        //    regexSearchReplace.ReplaceAll(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
+        //}
 
-        private void _view_CancelButtonClicked(object sender, EventArgs e)
-        {
-            //_view.Close();
-        }
+        //private void _view_CancelButtonClicked(object sender, EventArgs e)
+        //{
+        //    //_view.Close();
+        //}
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs b/RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs
@@ -85,7 +85,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
             if (item.Command != null)
             {
                 child.Click += child_Click;
-                ((CommandBarButton)child).HandleEvents();                
             }
             return child;
         }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs
@@ -159,7 +159,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
                 : string.Empty;
 
             child.Click += child_Click;
-            ((CommandBarButton)child).HandleEvents();
             return child;
         }
 
diff --git a/RetailCoder.VBE/UI/Command/RegexSearchReplaceCommand.cs b/RetailCoder.VBE/UI/Command/RegexSearchReplaceCommand.cs
@@ -16,7 +16,7 @@ public RegexSearchReplaceCommand(RegexSearchReplacePresenter presenter) : base(L
 
         protected override void ExecuteImpl(object parameter)
         {
-            _presenter.Show();
+            //_presenter.Show();
         }
     }
 }
diff --git a/Rubberduck.Parsing/ComHelper.cs b/Rubberduck.Parsing/ComHelper.cs
@@ -37,10 +37,10 @@ public static string GetTypeName(object comObj)
                     // obtain the ITypeInfo interface from the object
                     dispatch.GetTypeInfo(0, 0, out typeInfo);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     //Cannot get the ITypeInfo interface for the specified COM object
-                    return String.Empty;
+                    return string.Empty;
                 }
 
                 string typeName = "";
@@ -53,17 +53,17 @@ public static string GetTypeName(object comObj)
                     typeInfo.GetDocumentation(-1, out typeName, out documentation,
                         out helpContext, out helpFile);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     // Cannot extract ITypeInfo information
-                    return String.Empty;
+                    return string.Empty;
                 }
                 return typeName;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 // Unexpected error
-                return String.Empty;
+                return string.Empty;
             }
             finally
             {
diff --git a/Rubberduck.Parsing/Properties/AssemblyInfo.cs b/Rubberduck.Parsing/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-﻿using System.Reflection;
+﻿using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -18,6 +19,8 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
+[assembly: CLSCompliant(false)]
+
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("dd619c0b-6a3a-4aee-941d-ed940d8d142b")]
 
diff --git a/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs b/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs
@@ -165,6 +165,8 @@ private IEnumerable<IAnnotation> FindAnnotations(int line)
         /// </remarks>
         private void DeclareControlsAsMembers(IVBComponent form)
         {
+            if (form.Controls == null) { return; }
+
             foreach (var control in form.Controls)
             {
                 // The as type declaration should be TextBox, CheckBox, etc. depending on the type.
diff --git a/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj b/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj
@@ -112,7 +112,7 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/Abstract/IVBComponents.cs b/Rubberduck.VBEEditor/SafeComWrappers/Abstract/IVBComponents.cs
@@ -5,7 +5,7 @@ namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
 {
     public interface IVBComponents : ISafeComWrapper, IComCollection<IVBComponent>, IEquatable<IVBComponents>
     {
-        IVBComponent this[object index] { get; }
+        new IVBComponent this[object index] { get; }
 
         IVBE VBE { get; }
         IVBProject Parent { get; }
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBarButton.cs b/Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBarButton.cs
@@ -15,16 +15,6 @@ public CommandBarButton(Microsoft.Office.Core.CommandBarButton target)
         {
         }
 
-        public void HandleEvents()
-        {
-            ((Microsoft.Office.Core.CommandBarButton)Target).Click += Target_Click;
-        }
-
-        public void StopEvents()
-        {
-            ((Microsoft.Office.Core.CommandBarButton)Target).Click -= Target_Click;
-        }
-
         private Microsoft.Office.Core.CommandBarButton Button
         {
             get { return (Microsoft.Office.Core.CommandBarButton)Target; }
@@ -35,10 +25,24 @@ public static ICommandBarButton FromCommandBarControl(ICommandBarControl control
             return new CommandBarButton((Microsoft.Office.Core.CommandBarButton)control.Target);
         }
 
-        public event EventHandler<CommandBarButtonClickEventArgs> Click;
+        private EventHandler<CommandBarButtonClickEventArgs> _clickHandler; 
+        public event EventHandler<CommandBarButtonClickEventArgs> Click
+        {
+            add
+            {
+                ((Microsoft.Office.Core.CommandBarButton)Target).Click += Target_Click;
+                _clickHandler += value;
+            }
+            remove
+            {
+                ((Microsoft.Office.Core.CommandBarButton)Target).Click -= Target_Click;
+                _clickHandler -= value;
+            }
+        }
+
         private void Target_Click(Microsoft.Office.Core.CommandBarButton ctrl, ref bool cancelDefault)
         {
-            var handler = Click;
+            var handler = _clickHandler;
             if (handler == null)
             {
                 return;
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VBA/VBE.cs b/Rubberduck.VBEEditor/SafeComWrappers/VBA/VBE.cs
@@ -60,7 +60,7 @@ public IWindow MainWindow
                 {
                     return new Window(IsWrappingNullReference ? null : Target.MainWindow);
                 }
-                catch (InvalidComObjectException ex)
+                catch (InvalidComObjectException)
                 {
                     return null;
                 }
diff --git a/RubberduckTests/Grammar/ResolverTests.cs b/RubberduckTests/Grammar/ResolverTests.cs
@@ -2124,8 +2124,6 @@ End Sub
             Assert.AreEqual(1, declaration.References.Count());
         }
 
-        // Ignored because handling forms/hierarchies is an open issue.
-        [Ignore]
         [TestMethod]
         public void GivenControlDeclaration_ResolvesUsageInCodeBehind()
         {
diff --git a/RubberduckTests/Mocks/MockUserFormBuilder.cs b/RubberduckTests/Mocks/MockUserFormBuilder.cs
@@ -68,6 +68,7 @@ public Mock<IVBComponent> Build()
 
             var window = new Mock<IWindow>();
             window.SetupProperty(w => w.IsVisible, false);
+            _component.Setup(m => m.Controls).Returns(_vbControls.Object);
             _component.Setup(m => m.DesignerWindow()).Returns(window.Object);
 
             return _component;
diff --git a/RubberduckTests/Refactoring/ExtractMethod/ExtractMethodParameterClassificationTests.cs b/RubberduckTests/Refactoring/ExtractMethod/ExtractMethodParameterClassificationTests.cs
@@ -46,13 +46,12 @@ public void shouldUseEachRuleInRulesCollectionToCheckEachReference()
                 var qSelection = new QualifiedSelection(qualifiedModuleName, selection);
 
                 var emRule = new Mock<IExtractMethodRule>();
-                var theByte = new Byte();
                 emRule.Setup(emr => emr.setValidFlag(It.IsAny<IdentifierReference>(), It.IsAny<Selection>())).Returns(2);
                 var emRules = new List<IExtractMethodRule>() { emRule.Object, emRule.Object };
-                var SUT = new ExtractMethodParameterClassification(emRules);
+                var sut = new ExtractMethodParameterClassification(emRules);
 
                 //Act
-                SUT.classifyDeclarations(qSelection, declaration);
+                sut.classifyDeclarations(qSelection, declaration);
 
                 //Assert
                 // 2 rules on 1 referencdes = 2 validation checks
diff --git a/RubberduckTests/SourceControl/ChangesViewModelTests.cs b/RubberduckTests/SourceControl/ChangesViewModelTests.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -12,6 +13,7 @@ namespace RubberduckTests.SourceControl
     public class ChangesViewModelTests
     {
         private Mock<ISourceControlProvider> _provider;
+        private readonly object _locker = new object();
 
         [TestInitialize]
         public void SetupMocks()
@@ -80,10 +82,9 @@ public void ProviderCommits_NotificationOnSuccess()
             };
 
             var errorThrown = bool.FalseString; // need a reference type
-
             vm.ErrorThrown += (sender, e) =>
             {
-                lock (errorThrown)
+                lock (_locker)
                 {
                     MultiAssert.Aggregate(
                         () => Assert.AreEqual(e.Title, Rubberduck.UI.RubberduckUI.SourceControl_CommitStatus),
@@ -100,7 +101,7 @@ public void ProviderCommits_NotificationOnSuccess()
             vm.CommitCommand.Execute(null);
 
             //assert
-            lock (errorThrown)
+            lock (_locker)
             {
                 Assert.IsTrue(bool.Parse(errorThrown));
             }

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,12 @@ public ColumnInfo(string Title, hAlignment HorizontalAlignment = hAlignment.Left`
`43`	`43`
`44`	`44`	`public static class ExportFormatter`
`45`	`45`	`{`
`46`		`- public static string Csv(object[][] data, string Title, ColumnInfo[] ColumnInfos)`
	`46`	`+ public static string Csv(object[][] data, string title, ColumnInfo[] columnInfos)`
`47`	`47`	`{`
`48`		`- string s = "";`
`49`		`-`
`50`		`- string[] headerRow = new string[ColumnInfos.Length];`
`51`		`- for (var c = 0; c < ColumnInfos.Length; c++)`
	`48`	`+ var headerRow = new string[columnInfos.Length];`
	`49`	`+ for (var c = 0; c < columnInfos.Length; c++)`
`52`	`50`	`{`
`53`		`- headerRow[c] = CsvEncode(ColumnInfos[c].Title);`
	`51`	`+ headerRow[c] = CsvEncode(columnInfos[c].Title);`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`string[] rows = new string[data.Length];`
`@@ -63,7 +61,7 @@ public static string Csv(object[][] data, string Title, ColumnInfo[] ColumnInfos`
`63`	`61`	`}`
`64`	`62`	`rows[r] = string.Join(",", row);`
`65`	`63`	`}`
`66`		`- return CsvEncode(Title.Replace("\r\n"," ")) + Environment.NewLine + string.Join(",", headerRow) + Environment.NewLine + string.Join(Environment.NewLine, rows);`
	`64`	`+ return CsvEncode(title.Replace("\r\n"," ")) + Environment.NewLine + string.Join(",", headerRow) + Environment.NewLine + string.Join(Environment.NewLine, rows);`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`private static string CsvEncode(object value)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ namespace Rubberduck.Navigation.RegexSearchReplace`
`13`	`13`	`{`
`14`	`14`	`public class RegexSearchReplace : IRegexSearchReplace`
`15`	`15`	`{`
`16`		`- private readonly RegexSearchReplaceModel _model;`
`17`	`16`	`private readonly IVBE _vbe;`
`18`	`17`	`private readonly IRubberduckParser _parser;`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)`
`85`	`85`	`if (item.Command != null)`
`86`	`86`	`{`
`87`	`87`	`child.Click += child_Click;`
`88`		`- ((CommandBarButton)child).HandleEvents();`
`89`	`88`	`}`
`90`	`89`	`return child;`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)`
`159`	`159`	`: string.Empty;`
`160`	`160`
`161`	`161`	`child.Click += child_Click;`
`162`		`- ((CommandBarButton)child).HandleEvents();`
`163`	`162`	`return child;`
`164`	`163`	`}`
`165`	`164`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public RegexSearchReplaceCommand(RegexSearchReplacePresenter presenter) : base(L`
`16`	`16`
`17`	`17`	`protected override void ExecuteImpl(object parameter)`
`18`	`18`	`{`
`19`		`- _presenter.Show();`
	`19`	`+ //_presenter.Show();`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ public static string GetTypeName(object comObj)`
`37`	`37`	`// obtain the ITypeInfo interface from the object`
`38`	`38`	`dispatch.GetTypeInfo(0, 0, out typeInfo);`
`39`	`39`	`}`
`40`		`- catch (Exception ex)`
	`40`	`+ catch (Exception)`
`41`	`41`	`{`
`42`	`42`	`//Cannot get the ITypeInfo interface for the specified COM object`
`43`		`- return String.Empty;`
	`43`	`+ return string.Empty;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`string typeName = "";`
`@@ -53,17 +53,17 @@ public static string GetTypeName(object comObj)`
`53`	`53`	`typeInfo.GetDocumentation(-1, out typeName, out documentation,`
`54`	`54`	`out helpContext, out helpFile);`
`55`	`55`	`}`
`56`		`- catch (Exception ex)`
	`56`	`+ catch (Exception)`
`57`	`57`	`{`
`58`	`58`	`// Cannot extract ITypeInfo information`
`59`		`- return String.Empty;`
	`59`	`+ return string.Empty;`
`60`	`60`	`}`
`61`	`61`	`return typeName;`
`62`	`62`	`}`
`63`		`- catch (Exception ex)`
	`63`	`+ catch (Exception)`
`64`	`64`	`{`
`65`	`65`	`// Unexpected error`
`66`		`- return String.Empty;`
	`66`	`+ return string.Empty;`
`67`	`67`	`}`
`68`	`68`	`finally`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,8 @@ private IEnumerable<IAnnotation> FindAnnotations(int line)`
`165`	`165`	`/// </remarks>`
`166`	`166`	`private void DeclareControlsAsMembers(IVBComponent form)`
`167`	`167`	`{`
	`168`	`+ if (form.Controls == null) { return; }`
	`169`	`+`
`168`	`170`	`foreach (var control in form.Controls)`
`169`	`171`	`{`
`170`	`172`	`// The as type declaration should be TextBox, CheckBox, etc. depending on the type.`