Skip to content

Make WrapperElementsGenerator cacheable and move generated code to bunit.anglesharp package #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 5 commits into from
+205 −21
Closed

Make WrapperElementsGenerator cacheable and move generated code to bunit.anglesharp package #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef40940
Initial plan
Copilot Nov 21, 2025
4305df7
Make WrapperElementsGenerator cacheable with collect-and-execute pattern
Copilot Nov 21, 2025
0e8ad24
Fix cacheability by removing IAssemblySymbol from record and using Co…
Copilot Nov 21, 2025
b5dc661
Add defensive checks for interface name processing
Copilot Nov 21, 2025
9d75bfe
Make WrapperElementsGenerator cacheable and move generated code to bu…
Copilot Dec 19, 2025
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
93 changes: 92 additions & 1 deletion bunit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,46 +62,136 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bunit.tests", "tests\bunit.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bunit.generators.tests", "tests\bunit.generators.tests\bunit.generators.tests.csproj", "{D08F7F1D-74B1-4A76-86A2-94918863740C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bunit.anglesharp", "src\bunit.anglesharp\bunit.anglesharp.csproj", "{4591042C-410C-4BA1-A075-653F77891EDA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|x64.ActiveCfg = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|x64.Build.0 = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|x86.ActiveCfg = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|x86.Build.0 = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|Any CPU.Build.0 = Release|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|x64.ActiveCfg = Release|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|x64.Build.0 = Release|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|x86.ActiveCfg = Release|Any CPU
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|x86.Build.0 = Release|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Debug|x64.ActiveCfg = Debug|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Debug|x64.Build.0 = Debug|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Debug|x86.ActiveCfg = Debug|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Debug|x86.Build.0 = Debug|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Release|x64.ActiveCfg = Release|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Release|x64.Build.0 = Release|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Release|x86.ActiveCfg = Release|Any CPU
{6127D121-9387-451B-B15D-8350A32D3001}.Release|x86.Build.0 = Release|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|x64.ActiveCfg = Debug|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|x64.Build.0 = Debug|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|x86.ActiveCfg = Debug|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|x86.Build.0 = Debug|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|Any CPU.Build.0 = Release|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|x64.ActiveCfg = Release|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|x64.Build.0 = Release|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|x86.ActiveCfg = Release|Any CPU
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Release|x86.Build.0 = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|x64.ActiveCfg = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|x64.Build.0 = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|x86.ActiveCfg = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|x86.Build.0 = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|Any CPU.Build.0 = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|x64.ActiveCfg = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|x64.Build.0 = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|x86.ActiveCfg = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|x86.Build.0 = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|x64.ActiveCfg = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|x64.Build.0 = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|x86.ActiveCfg = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|x86.Build.0 = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|Any CPU.Build.0 = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|x64.ActiveCfg = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|x64.Build.0 = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|x86.ActiveCfg = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|x86.Build.0 = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|x64.ActiveCfg = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|x64.Build.0 = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|x86.Build.0 = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|Any CPU.Build.0 = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|x64.ActiveCfg = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|x64.Build.0 = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|x86.ActiveCfg = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|x86.Build.0 = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|x64.ActiveCfg = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|x64.Build.0 = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|x86.ActiveCfg = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|x86.Build.0 = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|Any CPU.Build.0 = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|x64.ActiveCfg = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|x64.Build.0 = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|x86.ActiveCfg = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|x86.Build.0 = Release|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Debug|x64.ActiveCfg = Debug|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Debug|x64.Build.0 = Debug|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Debug|x86.ActiveCfg = Debug|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Debug|x86.Build.0 = Debug|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Release|Any CPU.Build.0 = Release|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Release|x64.ActiveCfg = Release|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Release|x64.Build.0 = Release|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Release|x86.ActiveCfg = Release|Any CPU
{56889DE7-5E66-4E9C-815B-CBCFC9961612}.Release|x86.Build.0 = Release|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Debug|x64.ActiveCfg = Debug|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Debug|x64.Build.0 = Debug|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Debug|x86.ActiveCfg = Debug|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Debug|x86.Build.0 = Debug|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Release|Any CPU.Build.0 = Release|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Release|x64.ActiveCfg = Release|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Release|x64.Build.0 = Release|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Release|x86.ActiveCfg = Release|Any CPU
{D08F7F1D-74B1-4A76-86A2-94918863740C}.Release|x86.Build.0 = Release|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Debug|x64.ActiveCfg = Debug|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Debug|x64.Build.0 = Debug|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Debug|x86.ActiveCfg = Debug|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Debug|x86.Build.0 = Debug|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Release|Any CPU.Build.0 = Release|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Release|x64.ActiveCfg = Release|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Release|x64.Build.0 = Release|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Release|x86.ActiveCfg = Release|Any CPU
{4591042C-410C-4BA1-A075-653F77891EDA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -116,6 +206,7 @@ Global
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
{56889DE7-5E66-4E9C-815B-CBCFC9961612} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
{D08F7F1D-74B1-4A76-86A2-94918863740C} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
{4591042C-410C-4BA1-A075-653F77891EDA} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {24106918-1C86-4769-BDA6-9C80E64CD260}
Expand Down
7 changes: 7 additions & 0 deletions src/bunit.anglesharp/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<!-- Override parent properties -->
<PropertyGroup>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion ...s/Internal/AngleSharpWrapperExtensions.cs → ...Extensions/AngleSharpWrapperExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using System.Collections.Generic;
using AngleSharp.Dom;

namespace Bunit.Web.AngleSharp;

/// <summary>
/// Extensions for <see cref="IElement"/> wrapped inside <see cref="WrapperBase{TElement}" /> types.
/// </summary>
internal static class AngleSharpWrapperExtensions
public static class AngleSharpWrapperExtensions
{
/// <summary>
/// Unwraps a wrapped AngleSharp object, if it has been wrapped.
Expand Down
7 changes: 7 additions & 0 deletions src/bunit.anglesharp/Placeholder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// This file is a placeholder to ensure the project compiles
namespace Bunit.Web.AngleSharp
{
internal static class Placeholder
{
}
}
18 changes: 18 additions & 0 deletions src/bunit.anglesharp/bunit.anglesharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<RootNamespace>Bunit.Web.AngleSharp</RootNamespace>
<IsPackable>false</IsPackable>
<ImplicitUsings>disable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AngleSharp" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\bunit.generators.internal\bunit.generators.internal.csproj"
OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/bunit.generators.internal/Web.AngleSharp/WrapperElementGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.CodeAnalysis;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
Expand All @@ -10,7 +11,10 @@ internal static class WrapperElementGenerator
{
internal static string GenerateWrapperTypeSource(StringBuilder source, INamedTypeSymbol elm)
{
var name = $"{elm.Name.Substring(1)}Wrapper";
// Element interface names start with 'I' (e.g., IElement -> ElementWrapper)
var name = elm.Name.Length > 1 && elm.Name.StartsWith("I", StringComparison.Ordinal)
? $"{elm.Name[1..]}Wrapper"
: $"{elm.Name}Wrapper";
var wrappedTypeName = elm.ToDisplayString(GeneratorConfig.SymbolFormat);

source.AppendLine("#nullable enable");
Expand Down
Loading