Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into Issue1974

Hosch250 · Hosch250 · commit fe7026d195e9 · 2016-07-07T18:14:15.000-05:00
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -141,6 +141,11 @@ public void Startup()
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
             UpdateLoggingLevel();
+
+            if (_vbe.VBProjects.Count != 0)
+            {
+                _parser.State.OnParseRequested(this);
+            }
         }
 
         public void Shutdown()
diff --git a/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs b/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs
@@ -21,16 +21,17 @@ public ImplicitByRefParameterInspection(RubberduckParserState state)
 
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
-            var interfaceMembers = UserDeclarations.FindInterfaceImplementationMembers();
+            var interfaceMembersScope = UserDeclarations.FindInterfaceImplementationMembers().Select(m => m.Scope);
+            var builtinEventHandlers = State.AllDeclarations.FindBuiltInEventHandlers();
 
             var issues = (from item in UserDeclarations
                 where
                     !item.IsInspectionDisabled(AnnotationName)
                     && item.DeclarationType == DeclarationType.Parameter
                     // ParamArray parameters do not allow an explicit "ByRef" parameter mechanism.               
                     && !((ParameterDeclaration)item).IsParamArray
-                    && !interfaceMembers.Select(m => m.Scope).Contains(item.ParentScope)
-                    && !State.AllDeclarations.FindBuiltInEventHandlers().Contains(item.ParentDeclaration)
+                    && !interfaceMembersScope.Contains(item.ParentScope)
+                    && !builtinEventHandlers.Contains(item.ParentDeclaration)
                 let arg = item.Context as VBAParser.ArgContext
                 where arg != null && arg.BYREF() == null && arg.BYVAL() == null
                 select new QualifiedContext<VBAParser.ArgContext>(item.QualifiedName, arg))
diff --git a/RetailCoder.VBE/Inspections/InspectionResultBase.cs b/RetailCoder.VBE/Inspections/InspectionResultBase.cs
@@ -121,7 +121,7 @@ public int CompareTo(object obj)
         public object[] ToArray()
         {
             var module = QualifiedSelection.QualifiedName;
-            return new object[] { Inspection.Severity.ToString(), module.ProjectTitle, module.ComponentTitle, Description, QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.StartColumn };
+            return new object[] { Inspection.Severity.ToString(), module.ProjectTitle, module.ComponentName, Description, QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.StartColumn };
         }
 
         public string ToCsvString()
diff --git a/RetailCoder.VBE/Inspections/SelfAssignedDeclarationInspection.cs b/RetailCoder.VBE/Inspections/SelfAssignedDeclarationInspection.cs
@@ -39,7 +39,8 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                     && declaration.IsTypeSpecified
                     && !ValueTypes.Contains(declaration.AsTypeName)
                     && declaration.DeclarationType == DeclarationType.Variable
-                    && declaration.AsTypeDeclaration.DeclarationType != DeclarationType.UserDefinedType
+                    && (declaration.AsTypeDeclaration == null
+                        || declaration.AsTypeDeclaration.DeclarationType != DeclarationType.UserDefinedType)
                     && declaration.ParentScopeDeclaration != null
                     && declaration.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member))
                 .Select(issue => new SelfAssignedDeclarationInspectionResult(this, issue));
diff --git a/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs b/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
@@ -90,7 +91,25 @@ private string DeclareExplicitVariant(VBAParser.ArgContext context, out string i
             }
 
             instruction = context.GetText();
-            return instruction + ' ' + Tokens.As + ' ' + Tokens.Variant;
+            if (!context.children.Select(s => s.GetType()).Contains(typeof(VBAParser.ArgDefaultValueContext)))
+            {
+                return instruction + ' ' + Tokens.As + ' ' + Tokens.Variant;
+            }
+
+            var fix = string.Empty;
+            var hasArgDefaultValue = false;
+            foreach (var child in context.children)
+            {
+                if (child.GetType() == typeof(VBAParser.ArgDefaultValueContext))
+                {
+                    fix += Tokens.As + ' ' + Tokens.Variant + ' ';
+                    hasArgDefaultValue = true;
+                }
+
+                fix += child.GetText();
+            }
+
+            return hasArgDefaultValue ? fix : fix + ' ' + Tokens.As + ' ' + Tokens.Variant;
         }
 
         private string DeclareExplicitVariant(VBAParser.ConstSubStmtContext context, out string instruction)
diff --git a/RetailCoder.VBE/UI/Command/AddTestMethodCommand.cs b/RetailCoder.VBE/UI/Command/AddTestMethodCommand.cs
@@ -34,7 +34,8 @@ protected override bool CanExecuteImpl(object parameter)
                         d.DeclarationType == DeclarationType.ProceduralModule &&
                         d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
 
-            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);
+            // the code modules consistently match correctly, but the components don't
+            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.SelectedVBComponent.CodeModule);
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/AddTestMethodExpectedErrorCommand.cs b/RetailCoder.VBE/UI/Command/AddTestMethodExpectedErrorCommand.cs
@@ -34,7 +34,8 @@ protected override bool CanExecuteImpl(object parameter)
                         d.DeclarationType == DeclarationType.ProceduralModule &&
                         d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
 
-            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);
+            // the code modules consistently match correctly, but the components don't
+            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.SelectedVBComponent.CodeModule);
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs b/RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs
@@ -51,7 +51,7 @@ public void SetSelectionText(Declaration declaration)
                 if (selection.HasValue) { SetSelectionText(selection.Value); }
                 _selectionButton.TooltipText = _selectionButton.Caption;
             }
-            else if (declaration != null)
+            else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.ClassModule && declaration.DeclarationType != DeclarationType.ProceduralModule)
             {
                 var typeName = declaration.HasTypeHint
                     ? Declaration.TypeHintToTypeName[declaration.TypeHint]
@@ -63,6 +63,28 @@ public void SetSelectionText(Declaration declaration)
                     declaration.IdentifierName,
                     RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
                     string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + typeName);
+
+                _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
+                    ? _selectionButton.Caption
+                    : declaration.DescriptionString;
+            }
+            else if (declaration != null)
+            {
+                // todo: confirm this is what we want, and then refator
+                var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
+                if (selection.HasValue)
+                {
+                    var typeName = declaration.HasTypeHint
+                        ? Declaration.TypeHintToTypeName[declaration.TypeHint]
+                        : declaration.AsTypeName;
+
+                    _selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
+                        selection.Value.Selection,
+                        declaration.QualifiedName.QualifiedModuleName,
+                        declaration.IdentifierName,
+                        RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
+                        string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + typeName);
+                }
                 _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
                     ? _selectionButton.Caption
                     : declaration.DescriptionString;
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs b/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -260,6 +261,7 @@ private void _state_StateChanged(object sender, EventArgs e)
 
         private async void RefreshInspections()
         {
+            var stopwatch = Stopwatch.StartNew();
             IsBusy = true;
 
             var results = (await _inspector.FindIssuesAsync(_state, CancellationToken.None)).ToList();
@@ -289,6 +291,9 @@ private async void RefreshInspections()
                 IsBusy = false;
                 SelectedItem = null;
             });
+
+            stopwatch.Stop();
+            LogManager.GetCurrentClassLogger().Trace("Inspections loaded in {0}ms", stopwatch.ElapsedMilliseconds);
         }
 
         private void ExecuteQuickFixes(IEnumerable<CodeInspectionQuickFix> quickFixes)
diff --git a/RetailCoder.VBE/UnitTesting/NewTestMethodCommand.cs b/RetailCoder.VBE/UnitTesting/NewTestMethodCommand.cs
@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.Annotations;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 
@@ -67,11 +68,12 @@ public void NewTestMethod()
 
             try
             {
-                var declaration = _state.AllUserDeclarations.First(f =>
-                            f.DeclarationType == Parsing.Symbols.DeclarationType.ProceduralModule &&
+                var declaration = _state.AllUserDeclarations.FirstOrDefault(f =>
                             f.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.ActiveCodePane.CodeModule);
 
-                if (declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
+                if (declaration != null &&
+                    declaration.DeclarationType == DeclarationType.ProceduralModule &&
+                    declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
                 {
                     var module = _vbe.ActiveCodePane.CodeModule;
                     var name = GetNextTestMethodName(module.Parent);
@@ -95,11 +97,12 @@ public void NewExpectedErrorTestMethod()
 
             try
             {
-                var declaration = _state.AllUserDeclarations.First(f =>
-                            f.DeclarationType == Parsing.Symbols.DeclarationType.ProceduralModule &&
+                var declaration = _state.AllUserDeclarations.FirstOrDefault(f =>
                             f.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.ActiveCodePane.CodeModule);
 
-                if (declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
+                if (declaration != null &&
+                    declaration.DeclarationType == DeclarationType.ProceduralModule &&
+                    declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
                 {
                     var module = _vbe.ActiveCodePane.CodeModule;
                     var name = GetNextTestMethodName(module.Parent);
diff --git a/RetailCoder.VBE/UnitTesting/TestMethod.cs b/RetailCoder.VBE/UnitTesting/TestMethod.cs
@@ -109,7 +109,7 @@ public NavigateCodeEventArgs GetNavigationArgs()
 
         public object[] ToArray()
         {
-            return new object[] { Declaration.QualifiedName.QualifiedModuleName.ProjectTitle, Declaration.QualifiedName.QualifiedModuleName.ComponentTitle, Declaration.IdentifierName, 
+            return new object[] { Declaration.QualifiedName.QualifiedModuleName.ProjectTitle, Declaration.QualifiedName.QualifiedModuleName.ComponentName, Declaration.IdentifierName, 
                 _result.Outcome.ToString(), _result.Output, _result.StartTime.ToString(CultureInfo.InvariantCulture), _result.EndTime.ToString(CultureInfo.InvariantCulture), _result.Duration };
         }
 
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -319,6 +319,11 @@ private void ParseAll(CancellationTokenSource token)
 
         private Task[] ResolveReferencesAsync(CancellationToken token)
         {
+            foreach (var kvp in State.ParseTrees)
+            {
+                State.SetModuleState(kvp.Key.Component, ParserState.ResolvingReferences);
+            }
+
             var finder = new DeclarationFinder(State.AllDeclarations, State.AllComments, State.AllAnnotations);
             var passes = new List<ICompilationPass>
                 {
@@ -662,8 +667,12 @@ public void Dispose()
 
             if (_cancellationTokens[0] != null)
             {
-                _cancellationTokens[0].Cancel();
-                _cancellationTokens[0].Dispose();
+                try
+                {
+                    _cancellationTokens[0].Cancel();
+                    _cancellationTokens[0].Dispose();
+                }
+                catch (ObjectDisposedException) { /* todo: avoid this being thrown in the first place */ }
             }
         }
     }
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -119,7 +119,7 @@ private void Sinks_ProjectRenamed(object sender, IProjectRenamedEventArgs e)
                 return;
             }
 
-            Logger.Debug("Project {1} renamed.", e.ProjectId);
+            Logger.Debug("Project {0} was renamed.", e.ProjectId);
 
             RemoveProject(e.ProjectId);
             AddProject(e.ProjectId);
@@ -432,6 +432,10 @@ private ParserState EvaluateParserState()
                 }
             }
 
+            if (stateCounts[(int)ParserState.Pending] > 0)
+            {
+                result = ParserState.Pending;
+            }
             if (stateCounts[(int)ParserState.Parsing] > 0)
             {
                 result = ParserState.Parsing;
diff --git a/Rubberduck.VBEEditor/QualifiedModuleName.cs b/Rubberduck.VBEEditor/QualifiedModuleName.cs
diff --git a/RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs b/RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public int CompareTo(object obj)`
`121`	`121`	`public object[] ToArray()`
`122`	`122`	`{`
`123`	`123`	`var module = QualifiedSelection.QualifiedName;`
`124`		`- return new object[] { Inspection.Severity.ToString(), module.ProjectTitle, module.ComponentTitle, Description, QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.StartColumn };`
	`124`	`+ return new object[] { Inspection.Severity.ToString(), module.ProjectTitle, module.ComponentName, Description, QualifiedSelection.Selection.StartLine, QualifiedSelection.Selection.StartColumn };`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public string ToCsvString()`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ protected override bool CanExecuteImpl(object parameter)`
`34`	`34`	`d.DeclarationType == DeclarationType.ProceduralModule &&`
`35`	`35`	`d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));`
`36`	`36`
`37`		`- return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);`
	`37`	`+ // the code modules consistently match correctly, but the components don't`
	`38`	`+ return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.SelectedVBComponent.CodeModule);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`protected override void ExecuteImpl(object parameter)`