benchmark error repro

Stepami · Stepami · commit 59a27967a33a · 2025-12-02T14:15:54.000+03:00
diff --git a/benchmarks/HydraScript.Benchmarks/GeneratedRegexContainer.cs b/benchmarks/HydraScript.Benchmarks/GeneratedRegexContainer.cs
diff --git a/benchmarks/HydraScript.Benchmarks/HydraScript.Benchmarks.csproj b/benchmarks/HydraScript.Benchmarks/HydraScript.Benchmarks.csproj
@@ -5,12 +5,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Domain\HydraScript.Domain.Constants\HydraScript.Domain.Constants.csproj"
-                          OutputItemType="Analyzer" SetTargetFramework="TargetFramework=netstandard2.0"/>
-        <ProjectReference Include="..\..\src\Infrastructure\HydraScript.Infrastructure.LexerRegexGenerator\HydraScript.Infrastructure.LexerRegexGenerator.csproj"
-                          OutputItemType="Analyzer"
-                          ReferenceOutputAssembly="false"
-                          SetTargetFramework="TargetFramework=netstandard2.0"/>
         <ProjectReference Include="..\..\src\Infrastructure\HydraScript.Infrastructure\HydraScript.Infrastructure.csproj"/>
     </ItemGroup>
 
diff --git a/benchmarks/HydraScript.Benchmarks/InvokeBenchmark.cs b/benchmarks/HydraScript.Benchmarks/InvokeBenchmark.cs
@@ -27,7 +27,7 @@ public void GlobalSetup()
     {
         _provider = new ServiceCollection()
             .AddLogging(x => x.ClearProviders().AddProvider(NullLoggerProvider.Instance))
-            .AddDomain<GeneratedRegexContainer>()
+            .AddDomain()
             .AddApplication()
             .AddInfrastructure(dump: false, _updatableFileOptions.Value)
             .AddSingleton<IOptions<FileInfo>>(_updatableFileOptions)
diff --git a/src/HydraScript/HydraScript.csproj b/src/HydraScript/HydraScript.csproj
@@ -14,10 +14,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Infrastructure\HydraScript.Infrastructure.LexerRegexGenerator\HydraScript.Infrastructure.LexerRegexGenerator.csproj"
-                          OutputItemType="Analyzer"
-                          ReferenceOutputAssembly="false"
-                          PrivateAssets="all" />
         <ProjectReference Include="..\Infrastructure\HydraScript.Infrastructure\HydraScript.Infrastructure.csproj" />
     </ItemGroup>
 
diff --git a/src/HydraScript/Program.cs b/src/HydraScript/Program.cs
@@ -28,7 +28,7 @@ private static ExecuteCommand GetCommand()
     private static ServiceProvider GetServiceProvider(FileInfo fileInfo, bool dump) =>
         new ServiceCollection()
             .AddLogging(c => c.ClearProviders().AddZLoggerConsole())
-            .AddDomain<GeneratedRegexContainer>()
+            .AddDomain()
             .AddApplication()
             .AddInfrastructure(dump, fileInfo)
             .BuildServiceProvider();
diff --git a/src/Infrastructure/HydraScript.Infrastructure/GeneratedRegexContainer.cs b/src/Infrastructure/HydraScript.Infrastructure/GeneratedRegexContainer.cs
@@ -1,8 +1,7 @@
 using System.Text.RegularExpressions;
 using HydraScript.Domain.FrontEnd.Lexer;
-using HydraScript.Infrastructure;
 
-namespace HydraScript;
+namespace HydraScript.Infrastructure;
 
 public sealed partial class GeneratedRegexContainer : IGeneratedRegexContainer
 {
diff --git a/src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj b/src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj
@@ -1,6 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
+        <ProjectReference Include="..\HydraScript.Infrastructure.LexerRegexGenerator\HydraScript.Infrastructure.LexerRegexGenerator.csproj"
+                          OutputItemType="Analyzer"
+                          ReferenceOutputAssembly="false"
+                          PrivateAssets="all" />
         <ProjectReference Include="..\..\Application\HydraScript.Application.CodeGeneration\HydraScript.Application.CodeGeneration.csproj" />
         <ProjectReference Include="..\..\Application\HydraScript.Application.StaticAnalysis\HydraScript.Application.StaticAnalysis.csproj" />
     </ItemGroup>
diff --git a/src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs b/src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs
@@ -15,12 +15,11 @@ namespace HydraScript.Infrastructure;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddDomain<TGeneratedRegexContainer>(this IServiceCollection services)
-        where TGeneratedRegexContainer : class, IGeneratedRegexContainer
+    public static IServiceCollection AddDomain(this IServiceCollection services)
     {
         services.AddSingleton<ITextCoordinateSystemComputer, TextCoordinateSystemComputer>();
         services.AddSingleton<ITokenTypesProvider, TokenTypesProvider>();
-        services.AddSingleton<IStructure, Structure<TGeneratedRegexContainer>>();
+        services.AddSingleton<IStructure, Structure<GeneratedRegexContainer>>();
         services.AddSingleton<ILexer, RegexLexer>();
         services.AddSingleton<IParser, TopDownParser>();
 
diff --git a/tests/HydraScript.IntegrationTests/TestHostFixture.cs b/tests/HydraScript.IntegrationTests/TestHostFixture.cs
@@ -36,7 +36,7 @@ public void Dispose()
     public Runner GetRunner(Options options, Action<IServiceCollection>? configureTestServices = null)
     {
         var services = new ServiceCollection()
-            .AddDomain<GeneratedRegexContainer>()
+            .AddDomain()
             .AddApplication()
             .AddInfrastructure(options.Dump, new FileInfo(options.FileName));
         const string serilogTemplate = "[{Timestamp:HH:mm:ss} {Level:u} [{SourceContext}]]{NewLine}{Message:lj} {Exception}";
diff --git a/tests/HydraScript.UnitTests/Domain/FrontEnd/RegexLexerTests.cs b/tests/HydraScript.UnitTests/Domain/FrontEnd/RegexLexerTests.cs
@@ -3,6 +3,7 @@
 using HydraScript.Domain.FrontEnd.Lexer;
 using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
+using HydraScript.Infrastructure;
 
 namespace HydraScript.UnitTests.Domain.FrontEnd;
 
diff --git a/tests/HydraScript.UnitTests/Domain/FrontEnd/StructureTests.cs b/tests/HydraScript.UnitTests/Domain/FrontEnd/StructureTests.cs
@@ -2,6 +2,7 @@
 using HydraScript.Domain.FrontEnd.Lexer;
 using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
+using HydraScript.Infrastructure;
 
 namespace HydraScript.UnitTests.Domain.FrontEnd;
 
diff --git a/tests/HydraScript.UnitTests/Domain/FrontEnd/TopDownParserTests.cs b/tests/HydraScript.UnitTests/Domain/FrontEnd/TopDownParserTests.cs
@@ -1,6 +1,7 @@
 using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.FrontEnd.Parser;
 using HydraScript.Domain.FrontEnd.Parser.Impl;
+using HydraScript.Infrastructure;
 
 namespace HydraScript.UnitTests.Domain.FrontEnd;
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void GlobalSetup()`
`27`	`27`	`{`
`28`	`28`	`_provider = new ServiceCollection()`
`29`	`29`	`.AddLogging(x => x.ClearProviders().AddProvider(NullLoggerProvider.Instance))`
`30`		`- .AddDomain<GeneratedRegexContainer>()`
	`30`	`+ .AddDomain()`
`31`	`31`	`.AddApplication()`
`32`	`32`	`.AddInfrastructure(dump: false, _updatableFileOptions.Value)`
`33`	`33`	`.AddSingleton<IOptions<FileInfo>>(_updatableFileOptions)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`using System.Text.RegularExpressions;`
`2`	`2`	`using HydraScript.Domain.FrontEnd.Lexer;`
`3`		`-using HydraScript.Infrastructure;`
`4`	`3`
`5`		`-namespace HydraScript;`
	`4`	`+namespace HydraScript.Infrastructure;`
`6`	`5`
`7`	`6`	`public sealed partial class GeneratedRegexContainer : IGeneratedRegexContainer`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,11 @@ namespace HydraScript.Infrastructure;`
`15`	`15`
`16`	`16`	`public static class ServiceCollectionExtensions`
`17`	`17`	`{`
`18`		`- public static IServiceCollection AddDomain<TGeneratedRegexContainer>(this IServiceCollection services)`
`19`		`- where TGeneratedRegexContainer : class, IGeneratedRegexContainer`
	`18`	`+ public static IServiceCollection AddDomain(this IServiceCollection services)`
`20`	`19`	`{`
`21`	`20`	`services.AddSingleton<ITextCoordinateSystemComputer, TextCoordinateSystemComputer>();`
`22`	`21`	`services.AddSingleton<ITokenTypesProvider, TokenTypesProvider>();`
`23`		`- services.AddSingleton<IStructure, Structure<TGeneratedRegexContainer>>();`
	`22`	`+ services.AddSingleton<IStructure, Structure<GeneratedRegexContainer>>();`
`24`	`23`	`services.AddSingleton<ILexer, RegexLexer>();`
`25`	`24`	`services.AddSingleton<IParser, TopDownParser>();`
`26`	`25`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void Dispose()`
`36`	`36`	`public Runner GetRunner(Options options, Action<IServiceCollection>? configureTestServices = null)`
`37`	`37`	`{`
`38`	`38`	`var services = new ServiceCollection()`
`39`		`- .AddDomain<GeneratedRegexContainer>()`
	`39`	`+ .AddDomain()`
`40`	`40`	`.AddApplication()`
`41`	`41`	`.AddInfrastructure(options.Dump, new FileInfo(options.FileName));`
`42`	`42`	`const string serilogTemplate = "[{Timestamp:HH:mm:ss} {Level:u} [{SourceContext}]]{NewLine}{Message:lj} {Exception}";`