Merge pull request #3562 from IvenBach/Rubberduck.UI_C#6&7_Update

C#6/7 syntax updates

Author: retailcoder

RetailCoder.VBE/Extension.cs

@@ -52,19 +52,17 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
         {
             try
             {
-                if (Application is Microsoft.Vbe.Interop.VBE)
+                if (Application is Microsoft.Vbe.Interop.VBE vbe1)
                 {
-                    var vbe = (VBE) Application;                  
-                    _ide = new VBEditor.SafeComWrappers.VBA.VBE(vbe);
+                    _ide = new VBEditor.SafeComWrappers.VBA.VBE(vbe1);
                     VBENativeServices.HookEvents(_ide);
 
                     var addin = (AddIn)AddInInst;
                     _addin = new VBEditor.SafeComWrappers.VBA.AddIn(addin) { Object = this };
                 }
-                else if (Application is Microsoft.VB6.Interop.VBIDE.VBE)
+                else if (Application is Microsoft.VB6.Interop.VBIDE.VBE vbe2)
                 {
-                    var vbe = Application as Microsoft.VB6.Interop.VBIDE.VBE;
-                    _ide = new VBEditor.SafeComWrappers.VB6.VBE(vbe);
+                    _ide = new VBEditor.SafeComWrappers.VB6.VBE(vbe2);
 
                     var addin = (Microsoft.VB6.Interop.VBIDE.AddIn) AddInInst;
                     _addin = new VBEditor.SafeComWrappers.VB6.AddIn(addin);
@@ -87,7 +85,7 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
             }
         }
 
-        Assembly LoadFromSameFolder(object sender, ResolveEventArgs args)
+        private Assembly LoadFromSameFolder(object sender, ResolveEventArgs args)
         {
             var folderPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty;
             var assemblyPath = Path.Combine(folderPath, new AssemblyName(args.Name).Name + ".dll");

RetailCoder.VBE/UI/About/AboutControl.xaml.cs

@@ -33,7 +33,7 @@ private void CopyVersionInfo_MouseLeftButtonDown(object sender, MouseButtonEvent
         private void CopyVersionInfoToClipboard()
         {
             var sb = new System.Text.StringBuilder();
-            sb.AppendLine($"Rubberduck version: {this.Version.Text}");
+            sb.AppendLine($"Rubberduck version: {Version.Text}");
             sb.AppendLine($"Operating System: {Environment.OSVersion.VersionString}, {(Environment.Is64BitOperatingSystem ? "x64" : "x86")}");
             sb.AppendLine($"Host Product: {Application.ProductName} {(Environment.Is64BitProcess ? "x64" : "x86")}");
             sb.AppendLine($"Host Version: {Application.ProductVersion}");

RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs

@@ -32,7 +32,7 @@ public AddTestModuleCommand(IVBE vbe, RubberduckParserState state, IGeneralConfi
             _configLoader = configLoader;
         }
 
-        private string TestModuleEmptyTemplate = new StringBuilder()
+        private readonly string _testModuleEmptyTemplate = new StringBuilder()
             .AppendLine("'@TestModule")
             .AppendLine("'@Folder(\"Tests\")")
             .AppendLine()
@@ -81,10 +81,10 @@ private string GetTestModule(IUnitTestSettings settings)
             var assertType = string.Format("Rubberduck.{0}AssertClass", settings.AssertMode == AssertMode.StrictAssert ? string.Empty : "Permissive");
             var assertDeclaredAs = DeclarationFormatFor(AssertFieldDeclarationFormat, assertType, settings);
 
-            var fakesType = "Rubberduck.FakesProvider";
+            const string fakesType = "Rubberduck.FakesProvider";
             var fakesDeclaredAs = DeclarationFormatFor(FakesFieldDeclarationFormat, fakesType, settings); 
 
-            var formattedModuleTemplate = string.Format(TestModuleEmptyTemplate, assertDeclaredAs, fakesDeclaredAs);
+            var formattedModuleTemplate = string.Format(_testModuleEmptyTemplate, assertDeclaredAs, fakesDeclaredAs);
 
             if (settings.ModuleInit)
             {

RetailCoder.VBE/UI/Command/CodeExplorerCommand.cs

@@ -18,10 +18,7 @@ public CodeExplorerCommand(IDockablePresenter presenter)
             _presenter = presenter;
         }
 
-        public override RubberduckHotkey Hotkey
-        {
-            get { return RubberduckHotkey.CodeExplorer; }
-        }
+        public override RubberduckHotkey Hotkey => RubberduckHotkey.CodeExplorer;
 
         protected override void OnExecute(object parameter)
         {

RetailCoder.VBE/UI/Command/CommandBase.cs

@@ -64,8 +64,8 @@ public void Execute(object parameter)
 
         public event EventHandler CanExecuteChanged
         {
-            add { CommandManager.RequerySuggested += value; }
-            remove { CommandManager.RequerySuggested -= value; }
+            add => CommandManager.RequerySuggested += value;
+            remove => CommandManager.RequerySuggested -= value;
         }
     }
 }

RetailCoder.VBE/UI/Command/ExportAllCommand.cs

@@ -12,18 +12,15 @@ namespace Rubberduck.UI.Command
     public class ExportAllCommand : CommandBase 
     {
         private readonly IVBE _vbe;
-        private IFolderBrowserFactory _factory;
+        private readonly IFolderBrowserFactory _factory;
 
         public ExportAllCommand(IVBE vbe, IFolderBrowserFactory folderBrowserFactory) : base(LogManager.GetCurrentClassLogger())
         {
             _vbe = vbe;
             _factory = folderBrowserFactory;
         }
 
-        public override RubberduckHotkey Hotkey
-        {
-            get { return RubberduckHotkey.ExportActiveProject; }
-        }
+        public override RubberduckHotkey Hotkey => RubberduckHotkey.ExportActiveProject;
 
         protected override bool EvaluateCanExecute(object parameter)
         {
@@ -51,7 +48,7 @@ protected override void OnExecute(object parameter)
 
             var vbproject = parameter as IVBProject;
 
-            IVBProject project = projectNode?.Declaration.Project ?? vbproject ?? _vbe.ActiveVBProject;
+            var project = projectNode?.Declaration.Project ?? vbproject ?? _vbe.ActiveVBProject;
 
             var desc = string.Format(RubberduckUI.ExportAllCommand_SaveAsDialog_Title, project.Name);
 

RetailCoder.VBE/UI/Command/FindAllImplementationsCommand.cs

@@ -27,7 +27,7 @@ public class FindAllImplementationsCommand : CommandBase, IDisposable
         private readonly SearchResultPresenterInstanceManager _presenterService;
         private readonly IVBE _vbe;
 
-        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        private new static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public FindAllImplementationsCommand(INavigateCommand navigateCommand, IMessageBox messageBox,
             RubberduckParserState state, IVBE vbe, ISearchResultsWindowViewModel viewModel,
@@ -166,8 +166,7 @@ private SearchResultsViewModel CreateViewModel(Declaration target)
 
         private Declaration FindTarget(object parameter)
         {
-            var declaration = parameter as Declaration;
-            if (declaration != null)
+            if (parameter is Declaration declaration)
             {
                 return declaration;
             }
@@ -178,10 +177,9 @@ private Declaration FindTarget(object parameter)
         private IEnumerable<Declaration> FindImplementations(Declaration target)
         {
             var items = _state.AllDeclarations;
-            string name;
             var implementations = (target.DeclarationType == DeclarationType.ClassModule
-                ? FindAllImplementationsOfClass(target, items, out name)
-                : FindAllImplementationsOfMember(target, items, out name)) ?? new List<Declaration>();
+                ? FindAllImplementationsOfClass(target, items, out _)
+                : FindAllImplementationsOfMember(target, items, out _)) ?? new List<Declaration>();
 
             return implementations;
         }

RetailCoder.VBE/UI/Command/FindSymbolCommand.cs

@@ -27,10 +27,7 @@ public FindSymbolCommand(IVBE vbe, RubberduckParserState state, DeclarationIconC
             _iconCache = iconCache;
         }
 
-        public override RubberduckHotkey Hotkey
-        {
-            get { return RubberduckHotkey.FindSymbol; }
-        }
+        public override RubberduckHotkey Hotkey => RubberduckHotkey.FindSymbol;
 
         protected override void OnExecute(object parameter)
         {

RetailCoder.VBE/UI/Command/InspectionResultsCommand.cs

@@ -18,10 +18,7 @@ public InspectionResultsCommand(IDockablePresenter presenter)
             _presenter = presenter;
         }
 
-        public override RubberduckHotkey Hotkey
-        {
-            get { return RubberduckHotkey.InspectionResults; }
-        }
+        public override RubberduckHotkey Hotkey => RubberduckHotkey.InspectionResults;
 
         /// <summary>
         /// Runs code inspections 

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/IContextFormatter.cs

@@ -35,7 +35,7 @@ public string Format(ICodePane activeCodePane, Declaration declaration)
             var codePaneSelectionText = selection.Selection.ToString();
             var contextSelectionText = FormatDeclaration(declaration);
 
-            return string.Format("{0} | {1}", codePaneSelectionText, contextSelectionText);
+            return $"{codePaneSelectionText} | {contextSelectionText}";
         }
 
         public string Format(Declaration declaration, bool multipleControls)