Merge branch 'next' into 3389

Author: mansellan

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

@@ -51,9 +51,9 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
             _name = _declaration.IdentifierName;
 
             var component = declaration.QualifiedName.QualifiedModuleName.Component;
-            if (component.Type == ComponentType.Document)
+            try
             {
-                try
+                if (component.Type == ComponentType.Document)
                 {
                     var parenthesizedName = component.Properties["Name"].Value.ToString();
 
@@ -72,10 +72,10 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
                         _name += " (" + parenthesizedName + ")";
                     }
                 }
-                catch
-                {
-                    // gotcha! (this means that the property either doesn't exist or we weren't able to get it for some reason)
-                }
+            }
+            catch
+            {
+                // gotcha! (this means that the property either doesn't exist or we weren't able to get it for some reason)
             }
         }
 

Rubberduck.Inspections/Concrete/EmptyConditionBlockInspection.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Rubberduck.Inspections.Abstract;
+using Rubberduck.Parsing.Inspections.Abstract;
+using Rubberduck.Parsing.Inspections.Resources;
+using Antlr4.Runtime;
+using Antlr4.Runtime.Misc;
+using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing;
+using Rubberduck.Parsing.VBA;
+using Rubberduck.Inspections.Results;
+
+namespace Rubberduck.Inspections.Concrete
+{
+
+    internal class EmptyConditionBlockInspection : ParseTreeInspectionBase
+    {
+        public EmptyConditionBlockInspection(RubberduckParserState state)
+            : base(state, CodeInspectionSeverity.Suggestion) { }
+
+        public override Type Type => typeof(EmptyConditionBlockInspection);
+
+        public override IEnumerable<IInspectionResult> GetInspectionResults()
+        {
+            return Listener.Contexts
+                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
+                .Select(result => new QualifiedContextInspectionResult(this,
+                                                        InspectionsUI.EmptyConditionBlockInspectionsResultFormat,
+                                                        result));
+        }
+
+        public override IInspectionListener Listener { get; } = 
+            new EmptyConditionBlockListener();
+
+        public class EmptyConditionBlockListener : EmptyBlockInspectionListenerBase
+        {
+            public override void EnterIfStmt([NotNull] VBAParser.IfStmtContext context)
+            {
+                InspectBlockForExecutableStatements(context.block(), context);
+            }
+
+            public override void EnterElseIfBlock([NotNull] VBAParser.ElseIfBlockContext context)
+            {
+                InspectBlockForExecutableStatements(context.block(), context);
+            }
+
+            public override void EnterSingleLineIfStmt([NotNull] VBAParser.SingleLineIfStmtContext context)
+            {
+                AddResult(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context.ifWithEmptyThen()));
+            }
+
+            public override void EnterElseBlock([NotNull] VBAParser.ElseBlockContext context)
+            {
+                InspectBlockForExecutableStatements(context.block(), context);
+            }
+        }
+    }
+}

Rubberduck.Inspections/Concrete/ShadowedDeclarationInspection.cs

@@ -56,7 +56,7 @@ public override void EnterEnumerationStmt_Constant(VBAParser.EnumerationStmt_Con
             }
         }
 
-        public ShadowedDeclarationInspection(RubberduckParserState state) : base(state)
+        public ShadowedDeclarationInspection(RubberduckParserState state) : base(state, CodeInspectionSeverity.DoNotShow)
         {
         }