SYSLIB1045 compile regex at compiletime #11371
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mstv
reviewed
Nov 19, 2023
| private readonly Regex _htmlRegex = new(@"</[c-g\d]+>|</[i-o\d]+>|</[a\d]+>|</[q-z\d]+>|<[cg]+[^>]*>|<[i-o]+[^>]*>|<[q-z]+[^>]*>|<[a]+[^>]*>|<(\[^\]*\|'[^']*'|[^'\>])*>", RegexOptions.IgnoreCase & RegexOptions.Compiled); | ||
| [GeneratedRegex(@"^\d")] | ||
| private static partial Regex DigitRegex(); | ||
| [GeneratedRegex(@"</[c-g\d]+>|</[i-o\d]+>|</[a\d]+>|</[q-z\d]+>|<[cg]+[^>]*>|<[i-o]+[^>]*>|<[q-z]+[^>]*>|<[a]+[^>]*>|<(\[^\]*\|'[^']*'|[^'\>])*>")] |
There was a problem hiding this comment.
Suggested change
| [GeneratedRegex(@"</[c-g\d]+>|</[i-o\d]+>|</[a\d]+>|</[q-z\d]+>|<[cg]+[^>]*>|<[i-o]+[^>]*>|<[q-z]+[^>]*>|<[a]+[^>]*>|<(\[^\]*\|'[^']*'|[^'\>])*>")] | |
| [GeneratedRegex(@"</[c-g\d]+>|</[i-o\d]+>|</[a\d]+>|</[q-z\d]+>|<[cg]+[^>]*>|<[i-o]+[^>]*>|<[q-z]+[^>]*>|<[a]+[^>]*>|<(\[^\]*\|'[^']*'|[^'\>])*>", RegexOptions.IgnoreCase)] |
There was a problem hiding this comment.
This changes the behavior though: &
But probably what was intended...
Plugins/BuildServerIntegration/AzureDevOpsIntegration/Settings/ProjectUrlHelper.cs
Outdated
Show resolved
Hide resolved
mstv
reviewed
Nov 20, 2023
Plugins/BuildServerIntegration/AzureDevOpsIntegration/Settings/ProjectUrlHelper.cs
Outdated
Show resolved
Hide resolved
Plugins/BuildServerIntegration/AzureDevOpsIntegration/Settings/ProjectUrlHelper.cs
Outdated
Show resolved
Hide resolved
e99ad8f to
5af45e6
Compare
|
Rebased on master with the merged .net8. Squashed comments (and removed some not yet used GeneratedRegex for grep). |
5af45e6 to
9204154
Compare
|
Rebased, moved GeneratedRegex to start of class with other private (a few regex are public too) |
RussKie
approved these changes
Nov 26, 2023
Regex with static strings can be precompiled to improve performance.
9204154 to
2d58d49
Compare
|
squashed and rebased Will merge tomorrow unless there are protests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #11240
Proposed changes
Enable C# 12
https://devblogs.microsoft.com/dotnet/regular-expression-improvements-in-dotnet-7/#source-generation
Compile all static regex at compile time instead of at runtime.
See also #11370 that refers to https://learn.microsoft.com/en-us/dotnet/standard/base-types/best-practices-regex#regular-expressions-compiled-to-an-assembly
Before .NET7 either interpreted that executes slightly slower or compiled that slows down starting was used.
For .NET7 the recommended use is to compile regex at compile time, with both advantages.
This PR implements the analyzer suggestion with a few manual tweaks:
private static readonly Regexthe[GeneratedRegexattribute was placed in the top, to simplify comparisonsTest methodology
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.