Merge pull request #2090 from Hosch250/Issue2069

Fix random sort order

Author: Hosch250

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;

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,
     }
 }