+ new tag: removeSystemCollectionsAssociations

Author: akravtsova

src/PlantUmlClassDiagramGenerator.Library/ClassDiagramGenerator/ClassDiagramGenerator.cs

@@ -15,7 +15,8 @@ public partial class ClassDiagramGenerator(
     bool createAssociation = true,
     bool attributeRequired = false,
     bool excludeUmlBeginEndTags = false,
-    bool addPackageTags = false) : CSharpSyntaxWalker
+    bool addPackageTags = false,
+    bool removeSystemCollectionsAssociations = false) : CSharpSyntaxWalker
 {
     private readonly HashSet<string> types = [];
     private readonly List<SyntaxNode> additionalTypeDeclarationNodes = [];
@@ -28,6 +29,7 @@ public partial class ClassDiagramGenerator(
     private readonly bool attributeRequired = attributeRequired;
     private readonly bool excludeUmlBeginEndTags = excludeUmlBeginEndTags;
     private readonly bool addPackageTags = addPackageTags;
+    private readonly bool removeSystemCollectionsAssociations = removeSystemCollectionsAssociations;
     private readonly Dictionary<string, string> escapeDictionary = new()
     {
         {@"(?<before>[^{]){(?<after>{[^{])", "${before}&#123;${after}"},

src/PlantUmlClassDiagramGenerator.Library/ClassDiagramGenerator/PropertyVisitor.cs

@@ -1,8 +1,10 @@
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using PlantUmlClassDiagramGenerator.Attributes;
 
 namespace PlantUmlClassDiagramGenerator.Library.ClassDiagramGenerator;
 
@@ -32,33 +34,59 @@ public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
             || typeIgnoringNullable is PredefinedTypeSyntax
             || isTypeParameterProp)
         {
-            var modifiers = GetMemberModifiersText(node.Modifiers,
-                isInterfaceMember: node.Parent.IsKind(SyntaxKind.InterfaceDeclaration));
-            var name = node.Identifier.ToString();
-            //Property does not have an accessor is an expression-bodied property. (get only)
-            var accessorStr = "<<get>>";
-            if (node.AccessorList != null)
-            {
-                var accessor = node.AccessorList.Accessors
-                    .Where(x => !x.Modifiers.Select(y => y.Kind()).Contains(SyntaxKind.PrivateKeyword))
-                    .Select(x => $"<<{(x.Modifiers.ToString() == "" ? "" : (x.Modifiers.ToString() + " "))}{x.Keyword}>>");
-                accessorStr = string.Join(" ", accessor);
-            }
-            var useLiteralInit = node.Initializer?.Value?.Kind().ToString().EndsWith("LiteralExpression") ?? false;
-            var initValue = useLiteralInit
-                ? (" = " + escapeDictionary.Aggregate(node.Initializer.Value.ToString(),
-                    (n, e) => Regex.Replace(n, e.Key, e.Value)))
-                : "";
-
-            WriteLine($"{modifiers}{name} : {type} {accessorStr}{initValue}");
+            FillAssociatedProperty(node, type);
         }
         else
         {
             if (type.GetType() == typeof(GenericNameSyntax))
             {
-                additionalTypeDeclarationNodes.Add(type);
-            }
-            relationships.AddAssociationFrom(node, typeIgnoringNullable);
+                if (this.removeSystemCollectionsAssociations)
+                {
+                    var t = node.Type.ToString().Split('<')[0];
+                    if (!Enum.TryParse(t, out SystemCollectionsTypes _))
+                        additionalTypeDeclarationNodes.Add(type);
+                    else
+                    {
+                        FillAssociatedProperty(node, type);
+                        var s = node.Type.ToString();
+                        relationships.AddAssociationFrom(node, new PlantUmlAssociationAttribute()
+                        {
+                            Association = "o--",
+                            Name = s.Substring(s.IndexOf('<') + 1,s.LastIndexOf('>') - s.IndexOf('<') - 1)
+                        });
+                    }
+                }
+                else
+                {
+                    additionalTypeDeclarationNodes.Add(type);
+                    relationships.AddAssociationFrom(node, typeIgnoringNullable);
+                }
+            } else 
+                relationships.AddAssociationFrom(node, typeIgnoringNullable);
         }
     }
+
+    private void FillAssociatedProperty(PropertyDeclarationSyntax node, TypeSyntax type)
+    {
+        var modifiers = GetMemberModifiersText(node.Modifiers,
+            isInterfaceMember: node.Parent.IsKind(SyntaxKind.InterfaceDeclaration));
+        var name = node.Identifier.ToString();
+        //Property does not have an accessor is an expression-bodied property. (get only)
+        var accessorStr = "<<get>>";
+        if (node.AccessorList != null)
+        {
+            var accessor = node.AccessorList.Accessors
+                               .Where(x => !x.Modifiers.Select(y => y.Kind()).Contains(SyntaxKind.PrivateKeyword))
+                               .Select(x => $"<<{(x.Modifiers.ToString() == "" ? "" : (x.Modifiers.ToString() + " "))}{x.Keyword}>>");
+            accessorStr = string.Join(" ", accessor);
+        }
+
+        var useLiteralInit = node.Initializer?.Value?.Kind().ToString().EndsWith("LiteralExpression") ?? false;
+        var initValue = useLiteralInit
+            ? (" = " + escapeDictionary.Aggregate(node.Initializer.Value.ToString(),
+                (n, e) => Regex.Replace(n, e.Key, e.Value)))
+            : "";
+
+        WriteLine($"{modifiers}{name} : {type} {accessorStr}{initValue}");
+    }
 }

src/PlantUmlClassDiagramGenerator.Library/SystemCollectionsTypes.cs

@@ -0,0 +1,35 @@
+namespace PlantUmlClassDiagramGenerator.Library;
+
+public enum SystemCollectionsTypes
+{
+    // classes
+    ArrayList,
+    BitArray,
+    CaseInsensitiveComparer,
+    CaseInsensitiveHashCodeProvider,
+    CollectionBase,
+    Comparer,
+    DictionaryBase,
+    Hashtable,
+    Queue,
+    ReadOnlyCollectionBase,
+    SortedList,
+    Stack,
+    StructuralComparisons,
+    
+    // structs
+    DictionaryEntry,
+
+    // interfaces
+    ICollection,
+    IComparer,
+    IDictionary,
+    IDictionaryEnumerator,
+    IEnumerable,
+    IEnumerator,
+    IEqualityComparer,
+    IHashCodeProvider,
+    IList,
+    IStructuralComparable,
+    IStructuralEquatable
+}

src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromDirGenerator.cs

@@ -87,7 +87,8 @@ public bool GeneratePlantUml(Dictionary<string, string> parameters)
                         parameters.ContainsKey("-createAssociation"),
                         parameters.ContainsKey("-attributeRequired"),
                         excludeUmlBeginEndTags,
-                        parameters.ContainsKey("-addPackageTags"));
+                        parameters.ContainsKey("-addPackageTags"),
+                        parameters.ContainsKey("-removeSystemCollectionsAssociations"));
                     gen.Generate(root);
                     relationships.AddAll(gen.relationships);
                 }

src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromFileGenerator.cs

@@ -53,7 +53,9 @@ public bool GeneratePlantUml(Dictionary<string, string> parameters)
                 ignoreAcc,
                 parameters.ContainsKey("-createAssociation"),
                 parameters.ContainsKey("-attributeRequired"),
-                parameters.ContainsKey("-excludeUmlBeginEndTags"));
+                parameters.ContainsKey("-excludeUmlBeginEndTags"),
+                false,
+                parameters.ContainsKey("-removeSystemCollectionsAssociations"));
             gen.Generate(root);
         }
         catch (Exception e)

src/PlantUmlClassDiagramGenerator/Program.cs

@@ -32,7 +32,8 @@ enum OptionType
         ["-allInOne"] = OptionType.Switch,
         ["-attributeRequired"] = OptionType.Switch,
         ["-excludeUmlBeginEndTags"] = OptionType.Switch,
-        ["-addPackageTags"] = OptionType.Switch
+        ["-addPackageTags"] = OptionType.Switch,
+        ["-removeSystemCollectionsAssociations"] = OptionType.Switch
     };
 
     static int Main(string[] args)