Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
refactor: improve implementation of AddTypesToNamespaces loader task
Signed-off-by: Alexander Linne <[email protected]>
  • Loading branch information
alexanderlinne committed Sep 26, 2025
commit 987d3662a26ea44930f13b841b8c730ea8daf310
15 changes: 5 additions & 10 deletions ArchUnitNET/Loader/ArchBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,10 @@ public void LoadTypesForModule(ModuleDefinition module, string namespaceFilter)
}
});

_namespaceRegistry
.Namespaces.Where(ns => RegexUtils.MatchNamespaces(namespaceFilter, ns.FullName))
.ForEach(ns =>
{
_loadTaskRegistry.Add(
typeof(AddTypesToNamespace),
new AddTypesToNamespace(ns, currentTypes)
);
});
_loadTaskRegistry.Add(
typeof(AddTypesToNamespaces),
new AddTypesToNamespaces(currentTypes)
);
}

private void UpdateTypeDefinitions()
Expand All @@ -138,7 +133,7 @@ private void UpdateTypeDefinitions()
typeof(AddGenericArgumentDependencies),
typeof(AddClassDependencies),
typeof(AddBackwardsDependencies),
typeof(AddTypesToNamespace),
typeof(AddTypesToNamespaces),
}
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@

namespace ArchUnitNET.Loader.LoadTasks
{
internal class AddTypesToNamespace : ILoadTask
internal class AddTypesToNamespaces : ILoadTask
{
private readonly Namespace _ns;
private readonly List<IType> _types;

public AddTypesToNamespace(Namespace ns, List<IType> types)
public AddTypesToNamespaces(List<IType> types)
{
_ns = ns;
_types = types;
}

public void Execute()
{
((List<IType>)_ns.Types).AddRange(_types.Where(type => type.Namespace.Equals(_ns)));
foreach (var type in _types)
{
((List<IType>)type.Namespace.Types).Add(type);
}
}
}
}
Loading