Merge branch 'next' into 3260

Author: retailcoder

README.md

@@ -1,10 +1,12 @@
 <img src="http://i.stack.imgur.com/jnBEp.jpg" width=100% />
 
+<!-- campaign is no longer accepting donations
 ### Donate!
 
 If you like this project and would like to thank its contributors, you are welcome to support our GoFundMe campaign to finance Rubberduck swag and international shipping - contributors will be getting t-shirts, mugs, and other cool things.
 
 [![GoFundMe campaign](https://user-images.githubusercontent.com/5751684/29191799-e3d20b72-7dec-11e7-8ec6-0c69da4a3135.png)](https://www.gofundme.com/rubberduckvba)
+-->
 
 Branch     | Description | Build Status |
 |------------|---|--------------|

RetailCoder.VBE/API/VBA/Declaration.cs

@@ -56,7 +56,6 @@ internal Declaration(RubberduckDeclaration declaration)
                 { Parsing.Symbols.DeclarationType.Control, DeclarationType.Control },
                 { Parsing.Symbols.DeclarationType.UserForm, DeclarationType.UserForm },
                 { Parsing.Symbols.DeclarationType.Document, DeclarationType.Document },
-                { Parsing.Symbols.DeclarationType.ModuleOption, DeclarationType.ModuleOption },
                 { Parsing.Symbols.DeclarationType.Procedure, DeclarationType.Procedure },
                 { Parsing.Symbols.DeclarationType.Function, DeclarationType.Function },
                 { Parsing.Symbols.DeclarationType.PropertyGet, DeclarationType.PropertyGet },

RetailCoder.VBE/API/VBA/DeclarationType.cs

@@ -12,7 +12,6 @@ public enum DeclarationType
         Control, //= 1 << 3,
         UserForm,// = 1 << 4,
         Document,// = 1 << 5,
-        ModuleOption,// = 1 << 6,
         Procedure, //= 1 << 8,
         Function,// = 1 << 9,
         PropertyGet,// = 1 << 11,

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

@@ -190,6 +190,17 @@ public bool IsExpanded
 
         public bool IsSelected { get; set; }
 
+        private bool _isVisisble = true;
+        public bool IsVisible
+        {
+            get { return _isVisisble; }
+            set
+            {
+                _isVisisble = value;
+                OnPropertyChanged();
+            }
+        }
+
         public abstract string Name { get; }
         public abstract string NameWithSignature { get; }
         public abstract BitmapImage CollapsedIcon { get; }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -64,6 +64,8 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             OpenDesignerCommand = commands.OfType<OpenDesignerCommand>().SingleOrDefault();
 
             AddTestModuleCommand = commands.OfType<UI.CodeExplorer.Commands.AddTestModuleCommand>().SingleOrDefault();
+            AddTestModuleWithStubsCommand = commands.OfType<AddTestModuleWithStubsCommand>().SingleOrDefault();
+
             AddStdModuleCommand = commands.OfType<AddStdModuleCommand>().SingleOrDefault();
             AddClassModuleCommand = commands.OfType<AddClassModuleCommand>().SingleOrDefault();
             AddUserFormCommand = commands.OfType<AddUserFormCommand>().SingleOrDefault();
@@ -491,6 +493,7 @@ private void SwitchNodeState(CodeExplorerItemViewModel node, bool expandedState)
         public CommandBase OpenCommand { get; }
 
         public CommandBase AddTestModuleCommand { get; }
+        public CommandBase AddTestModuleWithStubsCommand { get; }
         public CommandBase AddStdModuleCommand { get; }
         public CommandBase AddClassModuleCommand { get; }
         public CommandBase AddUserFormCommand { get; }
@@ -574,6 +577,23 @@ public Visibility EmptyUIRefreshMessageVisibility
             }
         }
 
+        public void FilterByName(IEnumerable<CodeExplorerItemViewModel> nodes, string searchString)
+        {
+            foreach (var item in nodes)
+            {
+                if (item == null) { continue; }
+                
+                if (item.Items.Any())
+                {
+                    FilterByName(item.Items, searchString);
+                }
+                
+                item.IsVisible = item.Items.Any(c => c.IsVisible) ||
+                                 item.Name.ToLowerInvariant().Contains(searchString.ToLowerInvariant()) ||
+                                 string.IsNullOrEmpty(searchString);
+            }
+        }
+
         public void Dispose()
         {
             if (_state != null)

RetailCoder.VBE/Refactorings/Rename/RenameModel.cs

@@ -40,7 +40,7 @@ public RenameModel(IVBE vbe, RubberduckParserState state, QualifiedSelection sel
         private void AcquireTarget(out Declaration target, QualifiedSelection selection)
         {
             target = _declarations
-                .Where(item => item.IsUserDefined && item.DeclarationType != DeclarationType.ModuleOption)
+                .Where(item => item.IsUserDefined)
                 .FirstOrDefault(item => item.IsSelected(selection) || item.References.Any(r => r.IsSelected(selection)));
         }
     }

RetailCoder.VBE/Resources/magnifier-medium.png

@@ -29,6 +29,7 @@
     <NoWarn>1591</NoWarn>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <UseVSHostingProcess>true</UseVSHostingProcess>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -41,6 +42,7 @@
     <DocumentationFile>bin\Release\Rubberduck.XML</DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591</NoWarn>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -54,6 +56,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -151,6 +154,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug64|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -191,6 +195,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release64|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -395,10 +400,13 @@
     <Compile Include="UI\About\AboutDialog.Designer.cs">
       <DependentUpon>AboutDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\CodeExplorer\Commands\AddTestModuleWithStubsCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorerCommandAttribute.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CommitCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddUserFormCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CopyResultsCommand.cs" />
+    <Compile Include="UI\CodeExplorer\Converters\StringHasNoValueToVisibilityConverter.cs" />
+    <Compile Include="UI\CodeExplorer\Converters\StringHasValueToVisibilityConverter.cs" />
     <Compile Include="UI\Command\ExportAllCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\OpenProjectPropertiesCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\RenameCommand.cs" />
@@ -1285,6 +1293,7 @@
     <Resource Include="Resources\folder-open.png" />
     <Resource Include="Resources\folder.png" />
     <None Include="Resources\RD-300x250-base.png" />
+    <Resource Include="Resources\magnifier-medium.png" />
     <Content Include="Resources\Rubberduck\RD-AboutWindow.png" />
     <Content Include="Resources\Rubberduck\RD-InstallBanner.bmp" />
     <Content Include="Resources\Rubberduck\RD-InstallWindow.bmp" />

RetailCoder.VBE/Rubberduck.csproj

@@ -43,13 +43,16 @@ public CodeInspectionSetting GetSetting<TInspection>() where TInspection : IInsp
                 ?? GetSetting(typeof(TInspection));
         }
 
-        public CodeInspectionSetting GetSetting(Type inspection)
+        public CodeInspectionSetting GetSetting(Type inspectionType)
         {
             try
             {
-                var proto = Convert.ChangeType(Activator.CreateInstance(inspection), inspection);
-                var existing = CodeInspections.FirstOrDefault(s => proto.GetType().ToString().Equals(s.Name));
-                if (existing != null) return existing;
+                var existing = CodeInspections.FirstOrDefault(s => inspectionType.ToString().Equals(s.Name));
+                if (existing != null)
+                {
+                    return existing;
+                }
+                var proto = Convert.ChangeType(Activator.CreateInstance(inspectionType), inspectionType);
                 var setting = new CodeInspectionSetting(proto as IInspectionModel);
                 CodeInspections.Add(setting);
                 return setting;
@@ -80,37 +83,15 @@ public class CodeInspectionSetting : IInspectionModel
         [XmlIgnore]
         public string Description
         {
-            get
-            {
-                if (_description == null)
-                {
-                    _description = InspectionsUI.ResourceManager.GetString(Name + "Name");
-                }
-                return _description;
-            }
-            set
-            {
-                _description = value;
-            }
+            get => _description ?? (_description = InspectionsUI.ResourceManager.GetString(Name + "Name"));
+            set => _description = value;
         }// not serialized because culture-dependent
 
         [XmlIgnore]
-        public string LocalizedName
-        {
-            get
-            {
-                return InspectionsUI.ResourceManager.GetString(Name + "Name", CultureInfo.CurrentUICulture);
-            }
-        } // not serialized because culture-dependent
+        public string LocalizedName => InspectionsUI.ResourceManager.GetString(Name + "Name", CultureInfo.CurrentUICulture); // not serialized because culture-dependent
 
         [XmlIgnore]
-        public string AnnotationName
-        {
-            get
-            {
-                return Name.Replace("Inspection", string.Empty);
-            }
-        }
+        public string AnnotationName => Name.Replace("Inspection", string.Empty);
 
         [XmlIgnore]
         public CodeInspectionSeverity DefaultSeverity { get; private set; }
@@ -119,13 +100,7 @@ public string AnnotationName
         public CodeInspectionSeverity Severity { get; set; }
 
         [XmlIgnore]
-        public string Meta
-        {
-            get
-            {
-                return InspectionsUI.ResourceManager.GetString(Name + "Meta", CultureInfo.CurrentUICulture);
-            }
-        }
+        public string Meta => InspectionsUI.ResourceManager.GetString(Name + "Meta", CultureInfo.CurrentUICulture);
 
         [XmlIgnore]
         // ReSharper disable once UnusedMember.Global; used in string literal to define collection groupings
@@ -134,7 +109,7 @@ public string Meta
         [XmlIgnore]
         public string SeverityLabel
         {
-            get { return InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, CultureInfo.CurrentUICulture); }
+            get => InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, CultureInfo.CurrentUICulture);
             set
             {
                 foreach (var severity in Enum.GetValues(typeof(CodeInspectionSeverity)))