Fixes #3839, #3922 - CM Glyphs not working #3923
Merged
Conversation
This file contains 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
|
|
BDisp
approved these changes
Feb 26, 2025
tig
added a commit
that referenced
this pull request
Feb 28, 2025
* Moved scripts * testing versions * Rune extensions micro-optimizations (#3910) * Add benchmarks for potentially optimizable RuneExtensions * Add new RuneExtensions.DecodeSurrogatePair benchmark implementation Avoids intermediate heap array allocations which is especially nice when the rune is not surrogate pair because then array heap allocations are completely avoided. * Enable nullable reference types in RuneExtensions * Make RuneExtensions.MaxUnicodeCodePoint readonly Makes sure no one can accidentally change the value. Ideally would be const value. * Optimize RuneExtensions.DecodeSurrogatePair * Remove duplicate Rune.GetUnicodeCategory call * Add new RuneExtensions.IsSurrogatePair benchmark implementation Avoids intermediate heap allocations by using stack allocated buffer. * Optimize RuneExtensions.IsSurrogatePair * Add RuneExtensions.GetEncodingLength tests * Optimize RuneExtensions.GetEncodingLength * Optimize RuneExtensions.Encode * Print encoding name in benchmark results * Rename variable to better match return description * Add RuneExtensions.EncodeSurrogatePair benchmark --------- Co-authored-by: Tig <tig@users.noreply.github.com> * Reduce func allocations (#3919) * Replace Region.Contains LINQ lambdas with foreach loop Removes the lambda func allocations caused by captured outer variables. * Replace LineCanvas.Has LINQ lambda with foreach loop * Fix LineCanvas.GetMap intersects array nullability It should be enough to add null-forgiving operator somewhere in the LINQ query to make the final result non-null. No need to shove the nullability further down the line to complicate things. :) * Replace LineCanvas.All LINQ lambda with foreach loop * Replace Region.Intersect LINQ lambdas and list allocation with foreach loop and rented array * Use stackalloc buffer in Region.Intersect when max 8 rectangles * Fix LineCanvas.GetCellMap intersects array nullability * Remove leftover LineCanvas.GetRuneForIntersects null-conditional operators * Remove leftover IntersectionRuneResolver.GetRuneForIntersects null-conditional operators * PosAlign.CalculateMinDimension: calculate sum during loop No need to first put the dimensions in a list and then sum the list when you can just add to sum while looping through dimensions. * PosAlign.CalculateMinDimension: Remove intermediate list and related filter func allocation * TextFormatter.GetRuneWidth: Remove intermediate list and related sum func allocation * ReadOnlySpan refactor preparation for GetCellMap rewrite * LineCanvas.GetCellMap: Reuse intersection list outside nested loops GetCellMap would not benefit much from array pool because IntersectionDefinition is not struct. This change eliminates majority of the rest of Func<,> allocations. As a bonus IntersectionDefinition[] allocations dropped nicely. * Refactor local method UseRounded * Wrap too long list of method parameters * Region: Consistent location for #nullable enable --------- Co-authored-by: Tig <tig@users.noreply.github.com> * Fixes #3918 and #3913 - `Accepting` behavior (#3921) * Fixed #3905, #3918 * Tweaked Generic * Label code cleanup * Clean up. * Clean up. * Clean up2. * Fixes #3839, #3922 - CM Glyphs not working (#3923) * fixed * Moved Glyphs to ThemeScope * Removed test code * Fixed nav (#3926) * Fixes #3881. PositionCursor broke with recent ConsoleDriver changes. (#3927) * Reduce IntersectionType[] allocations (#3924) * Eliminate LineCanvas.Has params array allocation Inline ReadOnlySpan arguments do not incur heap allocation compared to regular arrays. * Allocate once LineCanvas.Exactly corner intersection arrays --------- Co-authored-by: Tig <tig@users.noreply.github.com> * API doc updates (#3928) --------- Co-authored-by: Tonttu <15074459+TheTonttu@users.noreply.github.com> Co-authored-by: BDisp <bd.bdisp@gmail.com>
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.
Fixes
ConfigManagerwith Glyph overrirdes is broken #3922Proposed Changes/Todos
New
config.jsonformat:{ "$schema": "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json", "Themes": [ { "Gruntled": { "Glyphs.LeftBracket": "[", "Glyphs.RightBracket": "]", "Glyphs.CheckStateChecked": "✓",GlyphssettingGlyphDefinitionsclass toGlyphsto ease use/portingGlyphsbe it's ownSerializableConfigurationPropertyof fromGlyph.XXXGlyphsinThemeScopePull Request checklist:
CTRL-K-Dto automatically reformat your files before committing.dotnet testbefore commit///style comments)