Merge branch 'next' into next

Author: bclothier

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.sln.docstates
 *.csproj.user
+*.csproj.DotSettings
 
 # External NuGet Packages
 [Pp]ackages/

.nuget/NuGet.exe

@@ -296,6 +296,9 @@
     <Reference Include="System.Printing" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
@@ -1388,6 +1391,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\Controls\ToolBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UI\Refactorings\EncapsulateField\EncapsulateFieldView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

RetailCoder.VBE/Rubberduck.csproj

@@ -1,4 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui_005Crefactorings_005Cextractinterface/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=unittesting_005Cstubs/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

RetailCoder.VBE/Rubberduck.csproj.DotSettings

@@ -14,5 +14,6 @@
   <package id="Ninject.Extensions.NamedScope" version="3.2.0.0" targetFramework="net45" />
   <package id="NLog" version="4.0.1" targetFramework="net45" />
   <package id="NLog.Schema" version="4.0.1" targetFramework="net45" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
   <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net45" />
 </packages>

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -0,0 +1,81 @@
+using Antlr4.Runtime;
+using Rubberduck.Parsing;
+using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Inspections.Abstract;
+using Rubberduck.VBEditor;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Rubberduck.Inspections.Concrete
+{
+    public class EmptyBlockInspectionListenerBase : VBAParserBaseListener, IInspectionListener
+    {
+        private readonly List<QualifiedContext<ParserRuleContext>> _contexts = new List<QualifiedContext<ParserRuleContext>>();
+        public IReadOnlyList<QualifiedContext<ParserRuleContext>> Contexts => _contexts;
+
+        public QualifiedModuleName CurrentModuleName { get; set; }
+
+        public void ClearContexts()
+        {
+            _contexts.Clear();
+        }
+
+        public void InspectBlockForExecutableStatements<T>(VBAParser.BlockContext block, T context) where T : ParserRuleContext
+        {
+            if (!BlockContainsExecutableStatements(block))
+            {
+                AddResult(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
+            }
+        }
+
+        public void AddResult(QualifiedContext<ParserRuleContext> qualifiedContext)
+        {
+            _contexts.Add(qualifiedContext);
+        }
+
+        private bool BlockContainsExecutableStatements(VBAParser.BlockContext block)
+        {
+            return block != null && block.children != null && ContainsExecutableStatements(block);
+        }
+
+        private bool ContainsExecutableStatements(VBAParser.BlockContext block)
+        {
+            foreach (var child in block.children)
+            {
+                if (child is VBAParser.BlockStmtContext)
+                {
+                    var blockStmt = (VBAParser.BlockStmtContext)child;
+                    var mainBlockStmt = blockStmt.mainBlockStmt();
+
+                    if (mainBlockStmt == null)
+                    {
+                        continue;   //We have a lone line lable, which is not executable.
+                    }
+
+                    Debug.Assert(mainBlockStmt.ChildCount == 1);
+
+                    // exclude variables and consts because they are not executable statements
+                    if (mainBlockStmt.GetChild(0) is VBAParser.VariableStmtContext ||
+                        mainBlockStmt.GetChild(0) is VBAParser.ConstStmtContext)
+                    {
+                        continue;
+                    }
+
+                    return true;
+                }
+
+                if (child is VBAParser.RemCommentContext ||
+                    child is VBAParser.CommentContext ||
+                    child is VBAParser.CommentOrAnnotationContext ||
+                    child is VBAParser.EndOfStatementContext)
+                {
+                    continue;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

RetailCoder.VBE/UI/Controls/ToolBar.xaml

@@ -0,0 +1,43 @@
+using Antlr4.Runtime.Misc;
+using Rubberduck.Inspections.Abstract;
+using Rubberduck.Inspections.Results;
+using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Inspections.Abstract;
+using Rubberduck.Parsing.Inspections.Resources;
+using Rubberduck.Parsing.VBA;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Rubberduck.Inspections.Concrete
+{
+    internal class EmptyCaseBlockInspection : ParseTreeInspectionBase
+    {
+        public EmptyCaseBlockInspection(RubberduckParserState state)
+            : base(state, CodeInspectionSeverity.Suggestion) { }
+
+        public override IInspectionListener Listener { get; } =
+            new EmptyCaseBlockListener();
+
+        public override Type Type => typeof(EmptyCaseBlockInspection);
+
+        public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
+
+        public override IEnumerable<IInspectionResult> GetInspectionResults()
+        {
+            return Listener.Contexts
+                .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
+                .Select(result => new QualifiedContextInspectionResult(this,
+                                                        InspectionsUI.EmptyCaseBlockInspectionResultFormat,
+                                                        result));
+        }
+
+        public class EmptyCaseBlockListener : EmptyBlockInspectionListenerBase
+        {
+            public override void EnterCaseClause([NotNull] VBAParser.CaseClauseContext context)
+            {
+                InspectBlockForExecutableStatements(context.block(), context);
+            }
+        }
+    }
+}