-
Notifications
You must be signed in to change notification settings - Fork 241
Cache indent strings in CodeWriter #12366
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.
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c6cac05
Cache indent strings in CodeWriter
ToddGrun 7adf396
Create explicit members for each combination
ToddGrun 83bc629
Simplify based on Dustin's suggestions
ToddGrun 1c00f60
Fix issue where combined tabs/spaces string generation would fail if …
ToddGrun 3b48880
Use Span.Fill to populate the span
ToddGrun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
...crosoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/CodeWriter.IndentCache.cs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
|
|
||
| namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration; | ||
|
|
||
| public sealed partial class CodeWriter | ||
| { | ||
| private static class IndentCache | ||
| { | ||
| private static readonly ReadOnlyMemory<char> s_tabs = new string('\t', 64).AsMemory(); | ||
| private static readonly ReadOnlyMemory<char> s_spaces = new string(' ', 128).AsMemory(); | ||
|
|
||
| public static ReadOnlyMemory<char> GetIndentString(int size, bool useTabs, int tabSize) | ||
| { | ||
| if (!useTabs) | ||
| { | ||
| return SliceOrCreate(size, s_spaces); | ||
| } | ||
|
|
||
| var tabCount = size / tabSize; | ||
| var spaceCount = size % tabSize; | ||
|
|
||
| if (spaceCount == 0) | ||
| { | ||
| return SliceOrCreate(tabCount, s_tabs); | ||
| } | ||
|
|
||
| return string.Create(length: tabCount + spaceCount, (tabCount, spaceCount), static (destination, state) => | ||
| { | ||
| var (tabCount, spaceCount) = state; | ||
|
|
||
| s_tabs.Span[..tabCount].CopyTo(destination); | ||
| s_spaces.Span[..spaceCount].CopyTo(destination[tabCount..]); | ||
| }).AsMemory(); | ||
| } | ||
|
|
||
| private static ReadOnlyMemory<char> SliceOrCreate(int length, ReadOnlyMemory<char> chars) | ||
| { | ||
| return (length <= chars.Length) | ||
| ? chars[..length] | ||
| : new string(chars.Span[0], length).AsMemory(); | ||
| } | ||
| } | ||
| } | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this will probably break on existing code somewhere. These are going to throw if
tabCountif greater than 64 orspaceCountis greater than 128. That's what the while loops andMath.Min(...)calls handled in my suggested implementation.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch! I think commit 3 should address that. Tests added. If you find a bug in it, I'll concede.