Sort NameSpaces and Types

Azure · May 14, 2024 · c663a95 · c663a95
1 parent a229c82
commit c663a95
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/dotnet/APIView/APIView/Model/TokenTreeModel.cs b/src/dotnet/APIView/APIView/Model/TokenTreeModel.cs
@@ -165,5 +165,17 @@ public override bool Equals(object obj)
             var other = (APITreeNode)obj;
             return Name == other.Name && Id == other.Id && Kind == other.Kind;
         }
+
+        public void SortChildren()
+        {
+            if (Kind.Equals("Namespace") || Kind.Equals("Type") || Kind.Equals("Member"))
+            {
+                Children.Sort((x, y) => x.Name.CompareTo(y.Name));
+            }
+            foreach (var child in Children)
+            {
+                child.SortChildren();
+            }
+        }
     }
 }
diff --git a/tools/apiview/parsers/csharp-api-parser/TreeToken/CodeFileBuilder.cs b/tools/apiview/parsers/csharp-api-parser/TreeToken/CodeFileBuilder.cs
@@ -106,6 +106,9 @@ public TreeTokenCodeFile Build(IAssemblySymbol assemblySymbol, bool runAnalysis,
                 diagnostics.TargetId = ConvertToValidCssId(diagnostics.TargetId);
             }
 
+            // Sort API Tree by name
+            apiTreeNode.SortChildren();
+
             var treeTokenCodeFile = new TreeTokenCodeFile()
             {
                 Name = $"{assemblySymbol.Name} ({assemblySymbol.Identity.Version})",
@@ -409,7 +412,7 @@ private void BuildMember(List<APITreeNode> apiTree, ISymbol member, bool inHidde
             apiTreeNode.Kind = "Member";
             apiTreeNode.Properties.Add("SubKind", member.Kind.ToString());
             apiTreeNode.Id = ConvertToValidCssId(member.GetId());
-            apiTreeNode.Name = member.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
+            apiTreeNode.Name = member.ToDisplayString();
             apiTreeNode.Tags.Add("HideFromNavigation");
 
             if (isHidden && !inHiddenScope)