Merge pull request rubberduck-vba#2575 from retailcoder/next

use meaningful names tweaks
retailcoder · Jan 24, 2017 · 693b349 · 693b349
2 parents c8e45f6 + c9dd5fc
commit 693b349
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 563 deletions.
diff --git a/RetailCoder.VBE/Inspections/UseMeaningfulNameInspection.cs b/RetailCoder.VBE/Inspections/UseMeaningfulNameInspection.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Common;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Resources;
 using Rubberduck.Inspections.Results;
@@ -27,22 +28,47 @@ public UseMeaningfulNameInspection(IMessageBox messageBox, RubberduckParserState
         public override string Description { get { return InspectionsUI.UseMeaningfulNameInspectionName; } }
         public override CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
 
+        private static readonly DeclarationType[] IgnoreDeclarationTypes = 
+        {
+            DeclarationType.ModuleOption,
+            DeclarationType.BracketedExpression, 
+            DeclarationType.LibraryFunction,
+            DeclarationType.LibraryProcedure, 
+        };
+
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var settings = _settings.Load(new CodeInspectionSettings()) ?? new CodeInspectionSettings();
-            var whitelistedNames = settings.WhitelistedIdentifiers.Select(s => s.Identifier).ToList();
+            var whitelistedNames = settings.WhitelistedIdentifiers.Select(s => s.Identifier).ToArray();
+
+            var handlers = Declarations.FindBuiltInEventHandlers();
 
             var issues = UserDeclarations
-                            .Where(declaration => declaration.DeclarationType != DeclarationType.ModuleOption &&
-                                                  !whitelistedNames.Contains(declaration.IdentifierName) &&
-                                                  (declaration.IdentifierName.Length < 3 ||
-                                                  char.IsDigit(declaration.IdentifierName.Last()) ||
-                                                  !declaration.IdentifierName.Any(c => 
-                                                      "aeiouy".Any(a => string.Compare(a.ToString(), c.ToString(), StringComparison.OrdinalIgnoreCase) == 0))))
+                            .Where(declaration => 
+                                !IgnoreDeclarationTypes.Contains(declaration.DeclarationType) &&
+                                (declaration.ParentDeclaration == null || 
+                                    !IgnoreDeclarationTypes.Contains(declaration.ParentDeclaration.DeclarationType) &&
+                                    !handlers.Contains(declaration.ParentDeclaration)) &&
+                                !whitelistedNames.Contains(declaration.IdentifierName) &&
+                                IsBadIdentifier(declaration.IdentifierName))
                             .Select(issue => new IdentifierNameInspectionResult(this, issue, State, _messageBox, _settings))
                             .ToList();
 
             return issues;
         }
+
+        private static bool IsBadIdentifier(string identifier)
+        {
+            return identifier.Length < 3 ||
+                   char.IsDigit(identifier.Last()) ||
+                   !HasVowels(identifier);
+        }
+
+        private static bool HasVowels(string identifier)
+        {
+            const string vowels = "aeiouyàâäéèêëïîöôùûü";
+            return  identifier.Any(character => vowels.Any(vowel => 
+                    string.Compare(vowel.ToString(), character.ToString(), StringComparison.OrdinalIgnoreCase) == 0));
+        }
     }
 }
diff --git a/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs b/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs
@@ -69,7 +69,7 @@ public class DeclarationSymbolsListener : VBAParserBaseListener
                     {
                         try
                         {
-                            if (coclass.Key.Count != _qualifiedName.Component.Properties.Count)
+                            if (_qualifiedName.Component == null || coclass.Key.Count != _qualifiedName.Component.Properties.Count)
                             {
                                 continue;
                             }

diff --git a/RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs b/RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs
@@ -53,6 +53,7 @@ End Sub
         }
 
         [TestMethod]
+        [DeploymentItem(@"TestFiles\")]
         [TestCategory("Inspections")]
         public void ImplicitActiveSheetReference_Ignored_DoesNotReportRange()
         {
@@ -87,8 +88,8 @@ End Sub
             Assert.AreEqual(0, inspectionResults.Count());
         }
 
-        [DeploymentItem(@"TestFiles\")]
         [TestMethod]
+        [DeploymentItem(@"TestFiles\")]
         public void ImplicitActiveSheetReference_IgnoreQuickFixWorks()
         {
             const string inputCode =

diff --git a/RubberduckTests/Inspections/ImplicitActiveWorkbookReferenceInspectionTests.cs b/RubberduckTests/Inspections/ImplicitActiveWorkbookReferenceInspectionTests.cs
@@ -17,6 +17,7 @@ namespace RubberduckTests.Inspections
     public class ImplicitActiveWorkbookReferenceInspectionTests
     {
         [TestMethod]
+        [DeploymentItem(@"TestFiles\")]
         [TestCategory("Inspections")]
         public void ImplicitActiveWorkbookReference_ReportsWorksheets()
         {
@@ -51,6 +52,7 @@ Sub foo()
         }
 
         [TestMethod]
+        [DeploymentItem(@"TestFiles\")]
         [TestCategory("Inspections")]
         public void ImplicitActiveWorkbookReference_Ignored_DoesNotReportRange()
         {
@@ -75,6 +77,7 @@ Sub foo()
             mockHost.SetupAllProperties();
 
             var parser = MockParser.Create(vbe.Object, new RubberduckParserState(new Mock<ISinks>().Object));
+            parser.State.AddTestLibrary("Excel.1.8.xml");
 
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }

diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj
@@ -185,7 +185,6 @@
     <Compile Include="Settings\InspectionSettingsTests.cs" />
     <Compile Include="Settings\GeneralSettingsTests.cs" />
     <Compile Include="Settings\IndenterSettingsTests.cs" />
-    <Compile Include="Settings\SettingsControlTests.cs" />
     <Compile Include="Settings\TodoSettingsTests.cs" />
     <Compile Include="Settings\UnitTestSettingsTests.cs" />
     <Compile Include="SmartIndenter\EndOfLineCommentTests.cs" />
@@ -197,7 +196,6 @@
     <Compile Include="SourceControl\BranchesViewModelTests.cs" />
     <Compile Include="SourceControl\ChangesViewModelTests.cs" />
     <Compile Include="SourceControl\SettingsViewModelTests.cs" />
-    <Compile Include="SourceControl\SourceControlTests.cs" />
     <Compile Include="SourceControl\SourceControlViewModelTests.cs" />
     <Compile Include="SourceControl\UnsyncedCommitsViewModelTests.cs" />
     <Compile Include="StringExtensionsTests.cs" />