Merge branch 'next' into Issue1681

Author: Hosch250

RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs

@@ -66,7 +66,7 @@ public override void Fix()
                 return;
             }
 
-            var fixedCodeLine = codeLine.Replace(originalInstruction, fix);
+            var fixedCodeLine = codeLine.Remove(Context.Start.Column, originalInstruction.Length).Insert(Context.Start.Column, fix);
             codeModule.ReplaceLine(Selection.Selection.StartLine, fixedCodeLine);
         }
 

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media.Imaging;
+using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.UI;
 using Rubberduck.VBEditor;
@@ -74,15 +75,22 @@ public override int Compare(CodeExplorerItemViewModel x, CodeExplorerItemViewMod
                 return xNode.Declaration.DeclarationType < yNode.Declaration.DeclarationType ? -1 : 1;
             }
 
-            // keep types with different icons and the same declaration type (document/class module) separate
-            // documents come first
+            if (xNode.Declaration.Accessibility != yNode.Declaration.Accessibility)
+            {
+                return xNode.Declaration.Accessibility < yNode.Declaration.Accessibility ? -1 : 1;
+            }
+            
             if (x.ExpandedIcon != y.ExpandedIcon)
             {
-                // ReSharper disable once PossibleInvalidOperationException - this will have a component
-                return x.QualifiedSelection.Value.QualifiedName.Component.Type ==
-                       Microsoft.Vbe.Interop.vbext_ComponentType.vbext_ct_Document
-                    ? -1
-                    : 1;
+                // ReSharper disable PossibleInvalidOperationException - this will have a component
+                var xComponent = x.QualifiedSelection.Value.QualifiedName.Component;
+                var yComponent = y.QualifiedSelection.Value.QualifiedName.Component;
+
+                if (xComponent.Type == vbext_ComponentType.vbext_ct_Document ^
+                    yComponent.Type == vbext_ComponentType.vbext_ct_Document)
+                {
+                    return xComponent.Type == vbext_ComponentType.vbext_ct_Document ? -1 : 1;
+                }
             }
 
             return 0;

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -274,6 +274,7 @@
             <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <EventSetter Event="PreviewMouseRightButtonDown" Handler="OnPreviewMouseRightButtonDown" />
+            <EventSetter Event="MouseDoubleClick" Handler="TreeView_OnMouseDoubleClick" />
             <Style.Triggers>
                 <Trigger Property="IsSelected" Value="True">
                     <Setter Property="BorderBrush" Value="#adc6e5"/>
@@ -726,7 +727,6 @@
                   Background="White"
                   ItemContainerStyle="{StaticResource ShinyTreeView}"
                   HorizontalContentAlignment="Stretch"
-                  MouseDoubleClick="TreeView_OnMouseDoubleClick"
                   Style="{StaticResource CodeExplorerTreeViewStyle}" BorderThickness="0,1"
                   VirtualizingPanel.IsVirtualizing="False">
             <i:Interaction.Behaviors>

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs

@@ -107,7 +107,7 @@ public CommandBase RefreshCommand
 
         private void _state_StateChanged(object sender, EventArgs e)
         {
-            if (_state.Status != ParserState.Ready)
+            if (_state.Status != ParserState.ResolvedDeclarations)
             {
                 return;
             }

Rubberduck.Parsing/Symbols/Accessibility.cs

@@ -2,11 +2,11 @@
 {
     public enum Accessibility
     {
-        Implicit,
-        Private,
-        Public,
-        Global,
-        Friend,
-        Static,
+        Private = 1,
+        Friend = 2,
+        Implicit = 3,
+        Public = 4,
+        Global = 5,
+        Static = 6,
     }
 }

RubberduckTests/Inspections/VariableTypeNotDeclaredInspectionTests.cs

@@ -279,6 +279,38 @@ public void VariableTypeNotDeclared_QuickFixWorks_Parameter()
             Assert.AreEqual(expectedCode, actual);
         }
 
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void VariableTypeNotDeclared_QuickFixWorks_SubNameContainsParameterName()
+        {
+            const string inputCode =
+@"Sub Foo(Foo)
+End Sub";
+
+            const string expectedCode =
+@"Sub Foo(Foo As Variant)
+End Sub";
+
+            //Arrange
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
+            var project = vbe.Object.VBProjects.Item(0);
+            var module = project.VBComponents.Item(0).CodeModule;
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState(vbe.Object, new Mock<ISinks>().Object));
+
+            parser.Parse(new CancellationTokenSource());
+            if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var inspection = new VariableTypeNotDeclaredInspection(parser.State);
+            inspection.GetInspectionResults().First().QuickFixes.First().Fix();
+
+            var actual = module.Lines();
+            Assert.AreEqual(expectedCode, actual);
+        }
+
         [TestMethod]
         [TestCategory("Inspections")]
         public void VariableTypeNotDeclared_QuickFixWorks_Variable()