Merge branch 'next' into next

Author: comintern

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspection.cs

@@ -26,9 +26,18 @@ public EncapsulatePublicFieldInspection(RubberduckParserState state, IIndenter i
 
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
+            // we're creating a public field for every control on a form, needs to be ignored.
+            var msForms = State.DeclarationFinder.FindProject("MSForms");
+            Declaration control = null;
+            if (msForms != null)
+            {
+                control = State.DeclarationFinder.FindClassModule("Control", msForms, true);
+            }
+
             var fields = State.DeclarationFinder.UserDeclarations(DeclarationType.Variable)
                 .Where(item => !IsIgnoringInspectionResultFor(item, AnnotationName)
-                               && item.Accessibility == Accessibility.Public)
+                               && item.Accessibility == Accessibility.Public
+                               && (control == null || !Equals(item.AsTypeDeclaration, control)))
                 .ToList();
 
             return fields

RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs

@@ -41,6 +41,9 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             var handlers = State.DeclarationFinder.UserDeclarations(DeclarationType.Control)
                 .SelectMany(control => declarations.FindEventHandlers(control)).ToList();
 
+            var builtInHandlers = State.AllDeclarations.FindBuiltInEventHandlers();
+            handlers.AddRange(builtInHandlers);
+
             var withEventFields = State.DeclarationFinder.UserDeclarations(DeclarationType.Variable).Where(item => item.IsWithEvents).ToList();
             var withHanders = withEventFields
                 .SelectMany(field => State.DeclarationFinder.FindHandlersForWithEventsField(field))

RetailCoder.VBE/Inspections/UseMeaningfulNameInspection.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Castle.Core.Internal;
+using Rubberduck.Common;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Resources;
 using Rubberduck.Inspections.Results;
@@ -27,22 +29,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 => !string.IsNullOrEmpty(declaration.IdentifierName) &&
+                                !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));
+        }
     }
 }

Rubberduck.Parsing/Symbols/DeclarationLoaders/AliasDeclarations.cs

@@ -56,7 +56,7 @@ public IReadOnlyList<Declaration> Load()
 
         private IReadOnlyList<Declaration> AddAliasDeclarations()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs

@@ -18,7 +18,7 @@ public DebugDeclarations(RubberduckParserState state)
 
         public IReadOnlyList<Declaration> Load()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

Rubberduck.Parsing/Symbols/DeclarationLoaders/FormEventDeclarations.cs

@@ -28,7 +28,7 @@ public IReadOnlyList<Declaration> Load()
 
         private static Declaration FormsClassModuleFromParserState(RubberduckParserState state)
         {
-            var finder = new DeclarationFinder(state.AllDeclarations, new IAnnotation[] { });
+            var finder = state.DeclarationFinder;
 
             var msForms = finder.FindProject("MSForms");
             if (msForms == null)

Rubberduck.Parsing/Symbols/DeclarationLoaders/SpecialFormDeclarations.cs

@@ -19,7 +19,7 @@ public SpecialFormDeclarations(RubberduckParserState state)
 
         public IReadOnlyList<Declaration> Load()
         {
-            var finder = new DeclarationFinder(_state.AllDeclarations, new IAnnotation[] { });
+            var finder = _state.DeclarationFinder;
 
             if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder))
             {

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -69,7 +69,7 @@ public DeclarationSymbolsListener(
                     {
                         try
                         {
-                            if (coclass.Key.Count != _qualifiedName.Component.Properties.Count)
+                            if (_qualifiedName.Component == null || coclass.Key.Count != _qualifiedName.Component.Properties.Count)
                             {
                                 continue;
                             }

Rubberduck.Parsing/Symbols/SquareBracketedNameComparer.cs

@@ -24,7 +24,7 @@ public int GetHashCode(string obj)
 
         private string ApplyBrackets(string value)
         {
-            if (value == null) return null;
+            if (string.IsNullOrEmpty(value)) return string.Empty;
 
             return value[0] == '[' && value[value.Length - 1] == ']'
                 ? value

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -107,7 +107,10 @@ public void Parse(CancellationTokenSource token)
             }
 
             SyncComReferences(State.Projects);
+            State.RefreshFinder(_hostApp);
+
             AddBuiltInDeclarations();
+            State.RefreshFinder(_hostApp);
 
             foreach (var component in components)
             {
@@ -229,7 +232,10 @@ private void ParseAll(object requestor, CancellationTokenSource token)
             }
 
             SyncComReferences(State.Projects);
+            State.RefreshFinder(_hostApp);
+
             AddBuiltInDeclarations();
+            State.RefreshFinder(_hostApp);
 
             // invalidation cleanup should go into ParseAsync?
             foreach (var key in _componentAttributes.Keys)