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

Author: Andrin Meier

RetailCoder.VBE/Inspections/Inspector.cs

@@ -104,7 +104,7 @@ private ParseTreeResults GetParseTreeResults(RubberduckParserState state)
             {
                 var result = new ParseTreeResults();
 
-                foreach (var componentTreePair in state.ParseTrees.Where(kvp => kvp.Value != null))
+                foreach (var componentTreePair in state.ParseTrees)
                 {
                     /*
                     Need to reinitialize these for each and every ParseTree we process, since the results are aggregated in the instances themselves 

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs

@@ -43,10 +43,13 @@ public UntypedFunctionUsageInspection(RubberduckParserState state)
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var declarations = BuiltInDeclarations
-                    // note: these *should* be functions, but somehow they're not defined as such
-                .Where(item => _tokens.Any(token => (item.IdentifierName == token || item.IdentifierName == "_B_var_" + token)) && item.References.Any());
+                // note: these *should* be functions, but somehow they're not defined as such
+                .Where(item =>
+                        _tokens.Any(token => item.IdentifierName == token || item.IdentifierName == "_B_var_" + token) &&
+                        item.References.Any(reference => _tokens.Contains(reference.IdentifierName)));
 
             return declarations.SelectMany(declaration => declaration.References
+                .Where(item => _tokens.Contains(item.IdentifierName))
                 .Select(item => new UntypedFunctionUsageInspectionResult(this, item)));
         }
     }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

@@ -97,7 +97,25 @@ private bool ContainsBuiltinDocumentPropertiesProperty()
         }
 
         private bool _isErrorState;
-        public bool IsErrorState { get { return _isErrorState; } set { _isErrorState = value; OnPropertyChanged(); } }
+        public bool IsErrorState
+        {
+            get { return _isErrorState; }
+            set
+            {
+                _isErrorState = value;
+                _icon = GetImageSource(resx.Error);
+
+
+                foreach (var item in Items)
+                {
+                    ((CodeExplorerMemberViewModel) item).ParentComponentHasError();
+                }
+
+                OnPropertyChanged();
+                OnPropertyChanged("CollapsedIcon");
+                OnPropertyChanged("ExpandedIcon");
+            }
+        }
 
         public bool IsTestModule
         {
@@ -149,7 +167,7 @@ private DeclarationType DeclarationType
             { DeclarationType.Document, GetImageSource(resx.document_office) }
         };
 
-        private readonly BitmapImage _icon;
+        private BitmapImage _icon;
         public override BitmapImage CollapsedIcon { get { return _icon; } }
         public override BitmapImage ExpandedIcon { get { return _icon; } }
     }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerErrorNodeViewModel.cs

@@ -57,13 +57,6 @@ public override int Compare(CodeExplorerItemViewModel x, CodeExplorerItemViewMod
                 return nodeComparison;
             }
 
-            // error nodes have the same sort value
-            if (x is CodeExplorerErrorNodeViewModel &&
-                y is CodeExplorerErrorNodeViewModel)
-            {
-                return 0;
-            }
-
             var xNode = (ICodeExplorerDeclarationViewModel)x;
             var yNode = (ICodeExplorerDeclarationViewModel)y;
 
@@ -153,13 +146,6 @@ public override int Compare(CodeExplorerItemViewModel x, CodeExplorerItemViewMod
                 return string.CompareOrdinal(x.NameWithSignature, y.NameWithSignature);
             }
 
-            // error nodes come after folders
-            if (x is CodeExplorerErrorNodeViewModel ^
-                y is CodeExplorerErrorNodeViewModel)
-            {
-                return x is CodeExplorerErrorNodeViewModel ? -1 : 1;
-            }
-
             return 0;
         }
     }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

@@ -146,7 +146,14 @@ private static string DetermineMemberName(Declaration declaration)
             }
         }
 
-        private readonly BitmapImage _icon;
+        public void ParentComponentHasError()
+        {
+            _icon = GetImageSource(resx.Warning);
+            OnPropertyChanged("CollapsedIcon");
+            OnPropertyChanged("ExpandedIcon");
+        }
+
+        private BitmapImage _icon;
         public override BitmapImage CollapsedIcon { get { return _icon; } }
         public override BitmapImage ExpandedIcon { get { return _icon; } }
     }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs

@@ -3,14 +3,16 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Input;
-using System.Windows.Threading;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Navigation.Folders;
+using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 using Rubberduck.UI.CodeExplorer.Commands;
 using Rubberduck.UI.Command;
+using Rubberduck.UI.Command.MenuItems;
+using Rubberduck.VBEditor;
 
 // ReSharper disable CanBeReplacedWithTryCastAndCheckForNull
 
@@ -20,12 +22,9 @@ public sealed class CodeExplorerViewModel : ViewModelBase, IDisposable
     {
         private readonly FolderHelper _folderHelper;
         private readonly RubberduckParserState _state;
-        private readonly Dispatcher _dispatcher;
 
         public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState state, List<ICommand> commands)
         {
-            _dispatcher = Dispatcher.CurrentDispatcher;
-
             _folderHelper = folderHelper;
             _state = state;
             _state.StateChanged += ParserState_StateChanged;
@@ -217,11 +216,6 @@ public string Description
                     return ((CodeExplorerCustomFolderViewModel) SelectedItem).FolderAttribute;
                 }
 
-                if (SelectedItem is CodeExplorerErrorNodeViewModel)
-                {
-                    return ((CodeExplorerErrorNodeViewModel) SelectedItem).Name;
-                }
-
                 return string.Empty;
             }
         }
@@ -267,9 +261,6 @@ private void ParserState_StateChanged(object sender, EventArgs e)
                 return;
             }
 
-
-            var components = userDeclarations.SelectMany(s => s.Key.VBComponents.Cast<VBComponent>()).FirstOrDefault(s => s.Name == "asdf");
-
             var newProjects = userDeclarations.Select(grouping =>
                 new CodeExplorerProjectViewModel(_folderHelper,
                     grouping.SingleOrDefault(declaration => declaration.DeclarationType == DeclarationType.Project),
@@ -322,36 +313,60 @@ private void ParserState_ModuleStateChanged(object sender, Parsing.ParseProgress
             }
 
             var componentProject = e.Component.Collection.Parent;
-            var node = Projects.OfType<CodeExplorerProjectViewModel>()
+            var projectNode = Projects.OfType<CodeExplorerProjectViewModel>()
                 .FirstOrDefault(p => p.Declaration.Project == componentProject);
 
-            if (node == null)
+            if (projectNode == null)
             {
                 return;
             }
 
-            var folderNode = node.Items.First(f => f is CodeExplorerCustomFolderViewModel && f.Name == node.Name);
+            SetErrorState(projectNode, e.Component);
 
-            AddErrorNode addNode = AddComponentErrorNode;
-            _dispatcher.BeginInvoke(addNode, node, folderNode, e.Component.Name);
-        }
+            if (_errorStateSet) { return; }
 
-        private delegate void AddErrorNode(CodeExplorerItemViewModel projectNode, CodeExplorerItemViewModel folderNode, string componentName);
-        private void AddComponentErrorNode(CodeExplorerItemViewModel projectNode, CodeExplorerItemViewModel folderNode,
-            string componentName)
-        {
-            Projects.Remove(projectNode);
-            RemoveFailingComponent(projectNode, componentName);
+            // at this point, we know the node is newly added--we have to add a new node, not just change the icon of the old one.
 
-            folderNode.AddChild(new CodeExplorerErrorNodeViewModel(folderNode, componentName));
-            Projects.Add(projectNode);
+            var folderNode = projectNode.Items.FirstOrDefault(f => f is CodeExplorerCustomFolderViewModel && f.Name == componentProject.Name);
 
-            if (SortByName)
+            UiDispatcher.Invoke(() =>
             {
-                // this setter does not ensure the values are the same
-                // it also sorts the projects by name
+                if (folderNode == null)
+                {
+                    folderNode = new CodeExplorerCustomFolderViewModel(projectNode, componentProject.Name,
+                        componentProject.Name);
+                    projectNode.AddChild(folderNode);
+                }
+
+                var declaration = CreateDeclaration(e.Component);
+                var newNode = new CodeExplorerComponentViewModel(folderNode, declaration, new List<Declaration>())
+                {
+                    IsErrorState = true
+                };
+
+                folderNode.AddChild(newNode);
+
+                // Force a refresh. OnPropertyChanged("Projects") didn't work.
                 Projects = Projects;
+            });
+        }
+
+        private Declaration CreateDeclaration(VBComponent component)
+        {
+            var projectDeclaration =
+                _state.AllUserDeclarations.FirstOrDefault(item =>
+                        item.DeclarationType == DeclarationType.Project &&
+                        item.Project.VBComponents.Cast<VBComponent>().Contains(component));
+
+            if (component.Type == vbext_ComponentType.vbext_ct_StdModule)
+            {
+                return new ProceduralModuleDeclaration(
+                        new QualifiedMemberName(new QualifiedModuleName(component), component.Name), projectDeclaration,
+                        component.Name, false, new List<IAnnotation>(), null);
             }
+
+            return new ClassModuleDeclaration(new QualifiedMemberName(new QualifiedModuleName(component), component.Name),
+                    projectDeclaration, component.Name, false, new List<IAnnotation>(), null);
         }
 
         private void ReorderChildNodes(IEnumerable<CodeExplorerItemViewModel> nodes)
@@ -363,30 +378,30 @@ private void ReorderChildNodes(IEnumerable<CodeExplorerItemViewModel> nodes)
             }
         }
 
-        private bool _removedNode;
-        private void RemoveFailingComponent(CodeExplorerItemViewModel itemNode, string componentName)
+        private bool _errorStateSet;
+        private void SetErrorState(CodeExplorerItemViewModel itemNode, VBComponent component)
         {
+            _errorStateSet = false;
+
             foreach (var node in itemNode.Items)
             {
                 if (node is CodeExplorerCustomFolderViewModel)
                 {
-                    RemoveFailingComponent(node, componentName);
+                    SetErrorState(node, component);
                 }
 
-                if (_removedNode)
+                if (_errorStateSet)
                 {
                     return;
                 }
 
                 if (node is CodeExplorerComponentViewModel)
                 {
-                    var component = (CodeExplorerComponentViewModel) node;
-                    if (component.Name == componentName)
+                    var componentNode = (CodeExplorerComponentViewModel) node;
+                    if (componentNode.GetSelectedDeclaration().QualifiedName.QualifiedModuleName.Component == component)
                     {
-                        itemNode.Items.Remove(node);
-                        _removedNode = true;
-
-                        return;
+                        componentNode.IsErrorState = true;
+                        _errorStateSet = true;
                     }
                 }
             }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -369,7 +369,6 @@
     <Compile Include="Inspections\MakeSingleLineParameterQuickFix.cs" />
     <Compile Include="Inspections\ObjectVariableNotSetInspection.cs" />
     <Compile Include="Inspections\RemoveExplicitCallStatmentQuickFix.cs" />
-    <Compile Include="Navigation\CodeExplorer\CodeExplorerErrorNodeViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\ICodeExplorerDeclarationViewModel.cs" />
     <Compile Include="Navigation\Folders\FolderHelper.cs" />
     <Compile Include="Refactorings\ExtractMethod\ExtractedMethod.cs" />

RetailCoder.VBE/Rubberduck.csproj

@@ -256,4 +256,7 @@
   <data name="Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\Resources\cross-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-</root>
+  <data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>