Repository navigation
Release v2.5.0-beta.1 - #5660
Merged
Merged
Conversation
Back-merge v2.4.17 from main into develop
Two defects in the new CanEdit mode:
- UpdateNumberView appended the value view after the up button, so the
SubViews order became [down, up, editor]. Because the focus chain is
derived from SubViews order, Tab navigation visited the up button before
the editor, contradicting the visual layout. Insert the value view between
the buttons via MoveSubViewTowardsStart.
- Every parsed keystroke set Value, whose setter reformatted the editor text,
making fractional entry impossible (typing "3." for a {0:0.00} field became
"3.00" immediately). Guard SetText with _editingFromUser so user typing
updates Value without overwriting the in-progress text; the editor still
resyncs on Up/Down and external Value changes.
Tests updated/added accordingly.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…itable-text-mode
#5588) * Fixes #5579. SynchronizationContext is not correctly implemented in v2 * Enforces that apps can be crested before call Run and the Begin method guarantee set the sync context for the current running app. * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Fix nullable warning * Reset callbackCalled before reusing it --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
--- updated-dependencies: - dependency-name: GitVersion.MsBuild dependency-version: 6.8.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
--- updated-dependencies: - dependency-name: Serilog dependency-version: 4.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
--- updated-dependencies: - dependency-name: System.IO.Abstractions dependency-version: 22.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…22.2.0 --- updated-dependencies: - dependency-name: TestableIO.System.IO.Abstractions.TestingHelpers dependency-version: 22.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
--- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-version: 18.8.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…iguration.Binder Bumps Microsoft.Extensions.Configuration from 10.0.7 to 10.0.10 Bumps Microsoft.Extensions.Configuration.Binder from 10.0.7 to 10.0.10 --- updated-dependencies: - dependency-name: Microsoft.Extensions.Configuration dependency-version: 10.0.10 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Configuration.Binder dependency-version: 10.0.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
--- updated-dependencies: - dependency-name: Microsoft.Extensions.Options dependency-version: 10.0.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 5 to 6. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](actions/setup-dotnet@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6 to 7. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v6...v7) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ild-6.8.2 Bump GitVersion.MsBuild from 6.8.1 to 6.8.2
Bump Serilog from 4.3.1 to 4.4.0
…actions-22.2.0 Bump System.IO.Abstractions from 22.1.1 to 22.2.0
…est.Sdk-18.8.1 Bump Microsoft.NET.Test.Sdk from 18.7.0 to 18.8.1
Bump Microsoft.Extensions.Configuration and Microsoft.Extensions.Configuration.Binder
…em.IO.Abstractions.TestingHelpers-22.2.0 Bump TestableIO.System.IO.Abstractions.TestingHelpers from 22.1.1 to 22.2.0
…s/setup-dotnet-6 Bump actions/setup-dotnet from 5 to 6
…sions.Options-10.0.10 Bump Microsoft.Extensions.Options from 10.0.9 to 10.0.10
…s/setup-go-7 Bump actions/setup-go from 6 to 7
…#5603) * ci: read the release branch name from env instead of interpolating it * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Tig <tig@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…5605) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Configuration.Json dependency-version: 10.0.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…put namespace (#5395)
* Initial plan * Add regression test for TableView horizontal overflow * Finalize TableView horizontal scrollbar fix * Add regression-test marker for TableView coverage --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
…rp (#5628) Bumps Microsoft.CodeAnalysis.Analyzers to 5.9.0 Bumps Microsoft.CodeAnalysis.CSharp to 5.9.0 --- updated-dependencies: - dependency-name: Microsoft.CodeAnalysis.Analyzers dependency-version: 5.9.0-1.26328.17 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.CodeAnalysis.CSharp dependency-version: 5.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--- updated-dependencies: - dependency-name: xunit.v3 dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…liant and non-virtual (#5371) * BREAKING CHANGE: Fixes #5366. Make View.Text notifications CWP-compliant Add signal-only CWP-compliant text-change workflow to View.Text: - Add protected virtual bool OnTextChanging() pre-change hook - Add public event EventHandler<CancelEventArgs>? TextChanging - Refactor OnTextChanged() from public void to protected virtual void (raises TextChanged event; subclasses can override) - Text setter now follows CWP flow: early-return on same value, OnTextChanging, TextChanging event, mutate, OnTextChanged - Canceling TextChanging prevents text mutation and suppresses TextChanged - Add 'new' keyword to TextField.TextChanging (intentional hiding with richer ResultEventArgs<string> semantics) - Add comprehensive unit tests for CWP behavior Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * BREAKING CHANGE: Make View.Text non-virtual; migrate all overrides to CWP events Remove �irtual from View.Text property and add SetTextDirect() for derived views to update base text without re-entering CWP flow. Migration patterns: - Simple views (Label, Button, CheckBox, TitleView, Code, Shortcut): Override OnTextChanged() to sync with internal models. - Domain adapters (DatePicker, ColorPicker, ProgressBar, ArrangerButton, LinearRangeViewBase): Override OnTextChanged() for parsing + SetTextDirect() for reverse sync. - Markdown views: Override OnTextChanged() + UpdateTextFormatterText() to suppress raw text rendering. - TextField/TextView: Use 'new' keyword (independent storage) + SetTextDirect() to keep base in sync. - TextValidateField: Override OnTextChanged() + SetTextDirect() after provider transforms. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix CI: ReactiveExample source generator conflict and XML cref warnings - ReactiveExample: Replace .Events().TextChanged on TextField with Observable.FromEventPattern to avoid ReactiveMarbles source generator producing conflicting handler code for the new/base TextChanging event pair (CS0123) - DateEditor/TimeEditor: Fix CS1574 by changing cref from TextValidateField.Text to View.Text Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address CR feedback: CWP compliance, polymorphic sync, ProgressBar fallback 1. OnTextChanging() now raises TextChanging event (CWP: virtual raises event) 2. TextField: override OnTextChanged() to sync internal _text from base.Text when set polymorphically via a View reference 3. TextView: override OnTextChanged() to sync internal TextModel from base.Text when set polymorphically via a View reference 4. ProgressBar: initialize Text to '0%' in constructor so SimplePlusPercentage renders on first draw Added 4 regression tests (verified failing before fixes, passing after). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix TextField and TextView to raise View.TextChanging in their setters TextField's ew Text setter now calls �ase.OnTextChanging() after its own validation passes (ValueChanging, TextField.TextChanging), so subscribers holding a View reference see the pre-change notification and can cancel. TextView's ew Text setter now calls OnTextChanging() at the start, so View.TextChanging is raised before the model is modified. This ensures both controls participate in the base-level CWP flow when their Text property is set directly (not just polymorphically). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove TextField's 'new Text' - use CWP overrides instead TextField now uses View.Text directly instead of hiding it with 'new'. This fixes the polymorphism issue: setting Text through a View reference now correctly goes through TextField's validation and model sync. Changes: - View.OnTextChanging now accepts 'string proposedValue' so overrides can validate the incoming text - TextField overrides OnTextChanging to sanitize (strip tabs/newlines), fire IValue<string>.ValueChanging, and fire TextField.TextChanging - TextField overrides OnTextChanged to sync the internal grapheme-list model, track history, fire ValueChanged, and adjust cursor - ProgressBar.OnTextChanging updated for new signature - TextView.OnTextChanging call updated for new signature Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * code cleanup * Remove public RaiseTextChanging - inline into OnTextChanging override The event is now raised directly inside the CWP override, as intended. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Refactor View.Text setter to use SetTextDirect Replaces direct field and UI updates in the View.Text property setter with a call to SetTextDirect(value). This centralizes text update logic, improving maintainability and reducing code duplication. * cleanup * Minimize TextField diff: remove member reordering churn Reset TextField.Text.cs to original member order and apply only semantic changes (CWP overrides, remove RaiseTextChanging, shadow TextChanging event). Revert cosmetic change in TextField.Mouse.cs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix CR feedback: move validation to OnTextChanging, protect RaiseTextChanged - TextValidateField: move ValueChanging cancellation from OnTextChanged to OnTextChanging so rejected edits never reach View.Text - DatePicker: add OnTextChanging override rejecting unparseable dates - ColorPicker: add OnTextChanging override rejecting unparseable colors - TextField: clear _pendingText when base.OnTextChanging cancels - TextView: add _ownSetterActive flag to skip redundant model sync - View.Text: change RaiseTextChanged from internal to protected internal - Add 5 regression tests in TextCwpTests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add Text↔Value consistency tests for DatePicker, ColorPicker, TextValidateField Positive-path tests verifying: - Valid text updates Value (DatePicker, ColorPicker, TextValidateField) - Value setter updates Text (DatePicker, ColorPicker) - ValueChanging cancellation keeps Text and provider consistent (TextValidateField) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Shortcut.Text aliases HelpText, but HelpView owns rendering. Suppress base text drawing to avoid overlapping CommandView. Refs #5632
* perf(output): skip clean gaps during flush Avoid one cursor-position sequence per clean cell in sparse dirty rows. Refs #5627 * add cursor positioning error handling Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix indents wth, copilot --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* fix(textfield): prevent long text overdraw Keep single-line content at one row and let TextField own text rendering. Refs #5640 * fix(textvalidatefield): prevent text overdraw Keep validated single-line content at one row and let the custom renderer own text drawing. Refs #5640 * fix(views): suppress generic text rendering * test(views): clean up drawing test sessions
* fix(input): scope ANSI key deduplication Use parser provenance instead of a timing window so legacy input remains lossless while immediate Kitty fallback duplicates are suppressed. Closes #5638 Refs #4918, #4949, #4977, #5618 * fix(input): require adjacent Kitty fallback Invalidate pending suppression on intervening raw input so later real keys remain lossless. Retain the protected pipeline clock for subclass compatibility. Refs #5638
…5646) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Configuration.Json dependency-version: 10.0.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--- updated-dependencies: - dependency-name: Xunit.Combinatorial dependency-version: 2.1.41 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(textview): restore state after event throws Finalize history and drawing state before TextChanged and always clear the setter guard after subscriber failures.\n\nRefs #5639 * fix(textview): allow reentrant base text sync Consume the one-shot synchronization guard before TextChanged subscribers run so nested View.Text assignments reach the model.\n\nRefs #5639 * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Tig <tig@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…ter MEC migration (#5416) * chore: start CM removal follow-up Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore: start CM removal follow-up Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add spec for legacy ConfigurationManager removal Companion to specs/replace-cm-with-mec.md. Defines the scope, design, and phased execution of fully removing CM after the MEC migration in #5411. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update removal spec to reflect Phase A1/B/C-extract landed in #5411 Removes from scope: ConfigurationManager.Applied subscriber rewiring (done via ThemeChanges in #5411), JSON converter SerializerContext sweep (done via TuiSerializerContext in #5411). Adds Phase A2 (Mec managers own runtime theme/scheme data) as the gating prerequisite for ScopeJsonConverter deletion. Sharpens D-02 decision (Option alpha: nested-only + TuiConfigMigrator; Option beta: custom legacy MEC source). Corrects PrintJsonErrors framing — behavior-preserving replacement is possible via JsonConfigurationSource.OnLoadException. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add CM removal prep artifact: AOT baseline, examples/test inventories - AOT baseline (post-#5411 @ 83ded73): NativeAot.exe = 22.77 MB, Terminal.Gui.dll = 1.77 MB, ConfigPropertyHostTypes roots 31 types. - Examples inventory: ~115 files but ~105 are the same one-line CM.Enable() call; identifies the 10 non-trivial scenarios that need per-site review (ConfigurationEditor, Runner, UICatalogRunnable, etc.). - Test inventory: ~13 files to delete, ~11 to keep, ~2 benchmarks to port. Flags glyph + apply-over-defaults behaviors that need MEC-side ports rather than straight deletion. - Records the reproduce command + threshold for the eventual size delta. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Resolve D-02 to alpha-lite (detect+warn, no library-side migration) Per source session decision: - Spec section 5.4 rewritten: pure-nested MEC read path + ~20 LOC peek-and-warn in TuiConfigurationBuilder.AddTuiJsonFile. Legacy shapes are NOT parsed; affected settings fall through to defaults. - Phase D scope shrinks: no TuiConfigMigrator, no LegacyTuiConfigurationSource, no round-trip tests. Two tests only (flat-key warn, array-themes warn). - Standalone Tools/MigrateConfig/ console app (not shipped in Terminal.Gui.dll) as migration aid; deletable any time. - Records explicitly-rejected alternatives (keep-both, silent-translate, throw) so future reviewers don't re-litigate. - Updated section 7 JSON-breaking-change wording and section 8 risk row to reflect the warn-and-default contract. - Prep artifact section 5 updated to reflect the now-unblocked Phase D step list. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add Tools/MigrateConfig console app for legacy config.json migration Standalone .NET 10 console utility, ~190 LOC including comments. Not included in Terminal.slnx and not part of any shipping artifact - exists solely so users on the legacy flat-key config.json shape have a one-shot upgrade path when the library stops parsing it. Transforms: - Top-level dotted property names split into nested objects. - 'Themes' array-of-single-key-objects collapses to dict. - 'Schemes' inside a theme follows the same collapse. Verified end-to-end on Terminal.Gui/Resources/config.json: 52 KB flat input -> 49 KB nested output, structurally correct. Includes Tools/README.md establishing the folder convention (not Examples, not in Terminal.slnx, deletable any release) and Tools/MigrateConfig/README.md with usage + lifecycle notes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add ThemeDefinition POCO bind target for nested Themes config (foundation only) Step 1 of N in the Phase A2/D commit chain for #5416. Lands the bind target for the post-D-rewrite nested `Themes` section in config.json. No production code consumes ThemeDefinition yet; the consumer (rewired MecThemeManager reading via IOptionsMonitor<ThemeSettings>) lands in a subsequent commit. Binding correctness validated by tests against in-memory MEC providers. Shape (named explicitly so reviewers can object to specific subsections): public class ThemeDefinition { public Dictionary<string, Scheme>? Schemes; // 18 nullable per-component override POCOs, matching every ThemeScope- // flavored BindSection<T> call in TuiConfigurationBuilder.ApplyToStaticFacades: public ButtonSettings? Button; public CheckBoxSettings? CheckBox; public CharMapSettings? CharMap; public DialogSettings? Dialog; public FrameViewSettings? FrameView; public HexViewSettings? HexView; public LinearRangeSettings? LinearRange; public MenuBarSettings? MenuBar; public MenuSettings? Menu; public MessageBoxSettings? MessageBox; public NerdFontsSettings? NerdFonts; public PopoverMenuSettings? PopoverMenu; public SelectorBaseSettings? SelectorBase; public StatusBarSettings? StatusBar; public TextFieldSettings? TextField; public TextViewSettings? TextView; public WindowSettings? Window; public GlyphSettings? Glyphs; // JSON section name is "Glyphs", not "Glyph" } Design choice: null = no theme-level override. Considered alternatives, rejected: (a) "Missing entry in dictionary" - forces a stringly-typed lookup; loses the IDE/compiler awareness that a strongly-typed nullable property gives. (b) "Explicit empty object" - makes "I appear in JSON but override nothing" indistinguishable from "I appear in JSON to assert my-own-values-as-overrides". Nullability avoids that ambiguity at the cost of zero ergonomics. Whether a non-null subsection (i) wholesale-replaces the root *Settings or (ii) property-level merges with it is a manager-rewire concern and is NOT encoded in the POCO. Both consumption strategies are compatible with this shape. Surfaced as an open design question for the PR thread. Source-gen registrations added for ThemeDefinition and Dictionary<string, ThemeDefinition>. These are additive, AOT-safe, and meaningful even before any consumer exists (they unblock the next commit without further SourceGenerationContext edits). Tests (Tests/UnitTestsParallelizable/Configuration/ThemeDefinitionBindingTests.cs): - Bind_FullAndPartialThemes_PartialHasNullsInOmittedSubsections - binds a nested sample with one fully-populated theme and one partial-override theme, asserts the partial theme has nulls in every unmentioned subsection. - Bind_SchemesDictionaryInsideTheme_PopulatesSchemes - binds Schemes as a Dictionary<string, Scheme> inside a ThemeDefinition. Verifies the MEC reflection binder handles Scheme directly via its parameterless ctor + init-only Normal property (PASSES - no SchemeDefinition DTO wrapper needed). - Bind_EmptyThemesSection_ProducesEmptyDictionary - degenerate case. All tests use AddJsonStream against in-memory JSON, not Resources/config.json, so they remain valid while the embedded library config keeps its legacy flat shape through Commits A and B. Explicit deferrals (subsequent commits): - MecThemeManager/MecSchemeManager rewire to consume ThemeDefinition via IOptionsMonitor<ThemeSettings>. - SwitchTheme overlay/replace algorithm. - Adding `Themes: Dictionary<string, ThemeDefinition>` to ThemeSettings. - TuiConfigurationBuilder.ApplyToStaticFacades themes binding. - Removal of legacy `ThemeManager.Theme = ...` and `.GetThemeNames()` delegation. - Resources/config.json rewrite to nested. - Peek-and-warn for legacy shapes. - ScopeJsonConverter deletion. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Spike: document MEC binder accessibility for two-pass overlay (A2 prep) Before mass-converting 18 *Settings POCOs to records with { get; internal set; } per the A2 design contract, validated the binder's behavior on the proposed accessibility shapes via a focused spike. Three Facts in MecBinderAccessibilitySpike, all passing, documenting observed behavior against this MEC version: 1. TwoPassBind_InternalSet_SilentlyIgnoredByBinder `{ get; internal set; }` is NOT written by Bind(existingInstance) under default BinderOptions. Both passes complete with no exception and the POCO stays at constructor defaults. Default BindingFlags = Public|Instance exclude internal accessors. 2. TwoPassBind_InitOnly_OverlaysCorrectly `{ get; init; }` IS written by Bind(existingInstance). Root-pass populates property A; subsequent overlay pass writes property B without disturbing A. Two-pass merge semantics are preserved end-to-end. 3. TwoPassBind_InternalSet_WorksWithBindNonPublicProperties Opting into o.BindNonPublicProperties = true at each Bind() call site rescues internal set. Trade-off: extra trim hint, non-default code path, two-line invocation at every bind site. Implication for the A2 manager-rewire commit: do NOT use internal set as the sender's design contract proposed. Two viable replacements: (A) Use { get; init; } on all 18 *Settings records. Works with MEC's default binder. Preserves immutability to public consumers. No accessibility escape hatch. Recommended. (B) Keep { get; internal set; } and opt into BindNonPublicProperties at every MecThemeManager bind call. Works, but adds a code-path divergence from the idiomatic MEC pattern and requires manual maintenance to stay enabled. Recommendation: (A). The sender's stated objection to init ("doesn't work via all reflection binder paths") is falsified by Fact 2 in this MEC version. If the sender has a specific reflection path in mind where init breaks (e.g. AOT source-gen binder for top-level Configure<T>(), as distinct from Bind(instance)), that should be named so we can validate with another spike. No production code changed in this commit. Spike file documents the wall so the sender can re-litigate the design choice before the 430+ call-site rollout. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * A2.1: convert 17 ThemeScope POCOs to immutable records with atomic Current swap Lands the heart of A2: replaces the mutable `*Settings.Defaults` pattern with immutable `sealed record` POCOs and a `Volatile`-swapped `Current` property, binding each ThemeScope POCO through MEC's two-pass overlay (root section + `Themes:<active>:<section>`). Pattern (per POCO): public sealed record FooSettings { public T Prop { get; init; } = ...; public static FooSettings Default { get; } = new (); public static FooSettings Current { get => Volatile.Read (ref _current); internal set => Volatile.Write (ref _current, value); } private static FooSettings _current = Default; } Why `init` (not `internal set`): the spike at Tests/UnitTestsParallelizable/Configuration/MecBinderAccessibilitySpike.cs (commit 84dbd6a) proves that `Bind(existingInstance)` silently ignores `internal set` under default BindingFlags=Public|Instance, while `init` accessors are written normally. `init` keeps the binder happy without an opt-in `BindNonPublicProperties=true` at every call site. Why a record (not a class) + `with`-swap setter on the view facade: records give us a free `with` expression for atomic replacement. The static View facades (e.g. `Button.DefaultShadow`) now read `Current.X` on get and do `Current = Current with { X = value }` on set. That keeps the legacy CM `ConfigProperty.Apply` reflection-write path functional during the transition (it calls `PropertyInfo.SetValue (null, value)` against the static facade, which still works), while MEC writes `Current` wholesale. Two-pass overlay (`TuiConfigurationBuilder.BindThemeScope<T>`): T next = new (); config.GetSection (sectionName).Bind (next); // root config.GetSection ($"Themes:{activeTheme}:{sectionName}").Bind (next); // overlay apply (next); // atomic Volatile.Write to Current MEC's `Bind(existing)` only writes properties present in JSON, so unmentioned overlay properties survive — property-level merge for free, matching legacy CM `Scope.Apply` semantics. No `Merge<T>` helper, no DeepCloner equivalent. Converted (17 POCOs): ButtonSettings, CheckBoxSettings, CharMapSettings, DialogSettings, FrameViewSettings, HexViewSettings, LinearRangeSettings, MenuBarSettings, MenuSettings, MessageBoxSettings, NerdFontsSettings, PopoverMenuSettings, SelectorBaseSettings, StatusBarSettings, TextFieldSettings, TextViewSettings, WindowSettings. View facades updated to `with`-swap (16 files, ~28 setter pairs): Button.cs, CheckBox.cs, CharMap.cs, Dialog.cs, FrameView.cs, HexView.cs, LinearRangeDefaults.cs, Menu.cs, MenuBar.cs, PopoverMenu.cs, MessageBox.cs, SelectorBase.cs, StatusBar.cs, TextField.cs, TextView.cs, Window.cs, Text/NerdFonts.cs. Deferred to A2.2: `Glyphs` facade redesign. `GlyphSettings` keeps its mutable `Defaults` pattern in this commit; `TuiConfigurationBuilder` still uses `BindSection<GlyphSettings>` for it. 288 call sites under `Glyphs.X` get the dedicated commit there. Deferred to A2.3: `NerdFonts` static facade redesign (the POCO is converted here; the facade still has a setter that does `with`-swap). Deferred to A2.4: removal of uncalled public static setters on View types. Out of scope (kept mutable, SettingsScope not ThemeScope): ApplicationSettings, DriverSettings, FileDialogSettings, FileDialogStyleSettings, KeySettings, ThemeSettings, TraceSettings. Tests: - New `ThemeOverlayMergeTests` (3 Facts) validates two-pass merge: overlay-overrides-root, no-overlay-uses-root, atomic-swap-does-not-mutate. - Updated `MecSettingsTests.StaticFacade_CanBeOverridden` to use `Current`. - Full suites green: 17,275 / 0 / 17 parallelizable; 72 / 0 / 2 non-parallelizable. Cross-assembly `init`: MEC's source-gen binder emits direct assignments for `Bind(existing)`, which would fail cross-assembly against `init`-only properties. Since `MecThemeManager` and `TuiConfigurationBuilder` live in `Terminal.Gui.dll` alongside the POCOs, intra-assembly calls compile fine. End-users hypothetically calling `cfg.Bind(ButtonSettings.Current)` from their app would hit a compile error — but no real consumer does this; they read `Current.X`. Reflection binder fallback works for that case anyway. Refs #4943 (CM-to-MEC replacement spec, A2). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * A2.2: Glyphs facade redesign + GlyphSettings record conversion Converts GlyphSettings to the immutable-record + atomic-swap Current pattern (matching A2.1's 17 ThemeScope POCOs) and collapses the Glyphs static facade from a CM-reflection target into a read-only projection over GlyphSettings.Current. Changes ======= Terminal.Gui/Configuration/Settings/GlyphSettings.cs - public class -> public sealed record. - ~143 Rune properties: { get; set; } -> { get; init; }. - Replaces static `Defaults` block with: Default (compile-time truth, never reassigned) Current (Volatile-read/write, internal set) _current (private backing, init'd to Default). - Bind target shape now matches all 17 A2.1 POCOs. Terminal.Gui/Drawing/Glyphs.cs - All 144 properties rewritten from [ConfigurationProperty] public static Rune NAME { get => Defaults.NAME; set => Defaults.NAME = value; } to bare expression-bodied readers: public static Rune NAME => GlyphSettings.Current.NAME; - Setters and [ConfigurationProperty] attributes fully removed. - File-level comment about "generates default config" dropped; the SaveDefaults reflection mechanism that produced that text is dead now that Glyphs has no [ConfigurationProperty] surface. The "Resources/config.json is source of truth at runtime" half stays accurate (theme overlay can still override compile-time defaults). - Call sites in Terminal.Gui/, Tests/, Examples/ unchanged: every Glyphs.NAME reader keeps working; only the host changed. Terminal.Gui/Configuration/Settings/TuiConfigurationBuilder.cs - Glyphs binding switched from BindSection<GlyphSettings> to BindThemeScope<GlyphSettings> (root -> overlay -> atomic publish), matching the other 17 theme-overlay POCOs. - activeTheme snapshot now has a TODO(A2) marker for the future ThemeSettings record conversion (review flag #4). Terminal.Gui/Configuration/ConfigPropertyHostTypes.cs - Drops `typeof (Glyphs)` from the `_types` list and removes the matching `[DynamicDependency (PRESERVED_MEMBERS, typeof (Glyphs))]`. Glyphs is no longer a CM reflection host. Terminal.Gui/Configuration/SourceGenerationContext.cs - Drops `[JsonSerializable (typeof (Glyphs))]`. Glyphs has no JSON bind state of its own; `GlyphSettings` is the bind target and is already covered elsewhere. specs/remove-legacy-cm.md - ┬º4.2 row for `Settings/*Settings.cs` annotated with the SettingsScope vs ThemeScope pattern divergence rationale (review flag #3). Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs - Three Skip markers added with the rationale "A2.2: Glyphs lost [ConfigurationProperty]; Resources/config.json Glyphs.X flat keys are now CM-unknown. Test removed with CM in step D." affecting: Load_WithValidResource_UpdatesSettingsScope Load_Runtime_Overrides Load_AddsResourceSourceToCollection These tests load `Terminal.Gui.Resources.config.json` through CM's SourcesManager.Load, which deserializes flat `Glyphs.X` keys via ScopeJsonConverter looking up ConfigProperty hosts. With Glyphs no longer registered, that path throws a JsonException -> Load returns false. The legacy CM contract these tests assert (flat-key resolve against reflection-discovered hosts) is exactly what A2.2 removes for Glyphs and what step D removes wholesale. Skipping is correct; the tests die with CM. Non-Default theme Glyph dormancy ================================ The flat `Glyphs.X` keys inside non-Default theme subsections of Resources/config.json (TurboPascal 5, Anders, Dark, Light, etc.) are dormant from this commit through step D. Active theme at startup is "Default", whose theme block in config.json is intentionally empty - so default startup is structurally unchanged. Glyph values for the Default theme come from GlyphSettings's `init` defaults, which by spec are the canonical Default values. Theme switching (MecThemeManager.SwitchTheme("TurboPascal 5") etc.) does NOT apply Glyph overrides during this window: - CM path: [ConfigurationProperty] removed from Glyphs in A2.2; ScopeJsonConverter no-ops the keys. - MEC path: BindThemeScope<GlyphSettings> reads section Themes:<name>:Glyphs, but the flat key form `"Glyphs.LeftBracket"` inside the theme block is treated by MEC as a literal top-level-of-theme key, not a Glyphs:LeftBracket nested path. Step D's config.json rewrite to nested form reactivates Glyph overrides for all theme-overlay POCOs uniformly. This dormancy is the same window that applies to every other ThemeScope POCO's flat keys in non-Default themes; Glyphs is not special. Test results ============ Tests/UnitTestsParallelizable: total 17292 / 17272 passed / 0 failed / 20 skipped (baseline post-A2.1 was 17275/0/17; delta is exactly the 3 new SourcesManagerTests skips). Tests/UnitTests.NonParallelizable: total 74 / 72 passed / 0 failed / 2 skipped (unchanged from baseline). Design context ============== This is commit A2.2 of the A2 series (POCO ownership migration on PR #5416, stacked on copilot/replace-cm-with-mec). A2.1 (commit 2f7c13a) landed the 17 ThemeScope POCOs and BindThemeScope<T>. A2.2 brings the 18th (GlyphSettings) and finishes the Glyphs facade. A2.3 will repeat the facade redesign for NerdFonts. A2.4 will remove dead public static setters on Button.DefaultShadow etc. Cross-session review (PR #5411 owner) signed off on: - { get; init; } on the 18 records (concedes prior internal-set recommendation; init works on intra-assembly Bind(existing)) - Glyphs file-comment cleanup (drop the SaveDefaults half) - Three Skip markers on SourcesManagerTests as the resolution path for the CM-vs-Glyphs schema mismatch Deferred (per A2 contract) ========================== - `with`-swap setters on the view facades have a non-atomic read-modify- write window vs. MEC's Volatile.Write; zero practical impact (single- threaded reflection apply path). Bridge code removes in A2.4 / CM deletion, eliminating the only lost-write race on Current. - BindThemeScope<T>'s [UnconditionalSuppressMessage] still cites ConfigPropertyHostTypes. When CM deletes in step D, the citation will be re-justified against TuiSerializerContext's JsonSerializable entries (or wired through explicit [DynamicDependency] per POCO). - ThemeSettings itself stays mutable in this commit (record conversion is a future micro-commit; non-blocking for A2.2 review). - Resources/config.json still ships Glyphs.X as flat keys. That JSON shape is part of step B/D (nested-section rewrite), not A2.2. Refs: A2.1 = 2f7c13a, stacked on copilot/replace-cm-with-mec. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * A2.3: NerdFonts facade redesign Mops up the small static facade for NerdFonts.Enable, matching the A2.2 pattern used for the Glyphs facade. NerdFontsSettings was already converted to a sealed record + Default/Current in A2.1; A2.3 just removes the CM-reflection scaffolding on the consumer-facing static facade. Changes ======= Terminal.Gui/Text/NerdFonts.cs - NerdFonts.Enable rewritten from [ConfigurationProperty (Scope = typeof (ThemeScope))] public static bool Enable { get => NerdFontsSettings.Current.Enable; set => NerdFontsSettings.Current = NerdFontsSettings.Current with { Enable = value }; } to a bare expression-bodied reader: public static bool Enable => NerdFontsSettings.Current.Enable; - [ConfigurationProperty] attribute removed. - `with`-swap setter removed; NerdFontsSettings.Current is now exclusively written by MecThemeManager via BindThemeScope<T>. - Caller surface unchanged: every NerdFonts.Enable reader keeps working; only the host changed. Terminal.Gui/Configuration/ConfigPropertyHostTypes.cs - Drops `typeof (NerdFonts)` from the `_types` list and removes the matching [DynamicDependency (PRESERVED_MEMBERS, typeof (NerdFonts))]. NerdFonts is no longer a CM reflection host. No Resources/config.json change needed ====================================== Grep against `Resources/config.json` for `NerdFonts` returns zero matches; the file has never carried NerdFonts.X overrides. The A2.2 non-Default-theme dormancy footnote therefore does not apply here. NerdFonts.Enable resolves to the C# init default (NerdFontsSettings.Default.Enable = false) at startup and remains so unless a consumer assigns NerdFontsSettings.Current via MEC binding, which today happens only via TuiConfigurationBuilder's BindThemeScope<NerdFontsSettings> against a (currently absent) MEC section. Test results ============ Tests/UnitTestsParallelizable: total 17292 / 17272 passed / 0 failed / 20 skipped (unchanged from A2.2; no new skips, no regressions). Tests/UnitTests.NonParallelizable: total 74 / 72 passed / 0 failed / 2 skipped (unchanged). Design context ============== This is commit A2.3 of the A2 series (POCO ownership migration on PR #5416, stacked on copilot/replace-cm-with-mec). A2.1 (2f7c13a) landed the 17 ThemeScope POCOs and BindThemeScope<T>. A2.2 (441ef60 post-amend) landed the 18th (GlyphSettings) + Glyphs facade. A2.3 mops up NerdFonts. A2.4 will remove dead public static setters on Button.DefaultShadow etc. Cross-session review (PR #5411 owner) signed off on: - One-line reader pattern for NerdFonts.Enable; drop the `with`-swap setter that bridged CM's reflection write path. - ConfigPropertyHostTypes row removal mirrors A2.2's Glyphs treatment. Deferred (per A2 contract) ========================== - A2.4: removal of dead public static setters on view facades (Button.DefaultShadow, etc.) -- next commit. - Step D: CM deletion, config.json schema rewrite, BindThemeScope<T> suppression re-justification. Refs: A2.1 = 2f7c13a, A2.2 = 441ef60, stacked on copilot/replace-cm-with-mec. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * A2.4: Remove dead public static setters on view facades Removes [ConfigurationProperty (Scope = typeof (ThemeScope))] from all view-class static facade properties (Button.DefaultShadow, Dialog.DefaultBorderStyle, etc.) and collapses their bridge get/set bodies to bare expression-bodied readers, matching the A2.2 Glyphs and A2.3 NerdFonts patterns. These properties existed solely as CM-reflection bind targets — the `with`-swap setter (`Current = Current with { X = value }`) was the only writer, called by ConfigProperty.Apply via PropertyInfo.SetValue against the embedded Resources/config.json flat keys. Audit confirmed zero external callers of the setters; tests that read the getters (e.g. ButtonTests asserting `button.ShadowStyle == Button.DefaultShadow`) continue to work — only the host plumbing changed. Net effect at runtime ===================== For every affected property: - Default theme: value comes from `<X>Settings.Default.<Prop>`'s C# init default. Unchanged. - Non-Default themes (Dark, Light, TurboPascal 5, Anders, etc.): flat-key overrides like `"Button.DefaultShadow": "Opaque"` in Resources/config.json are dormant from this commit through step D. Same scope as the A2.2 Glyphs dormancy: CM path no longer matches these keys (the [ConfigurationProperty] hosts are gone) and MEC path can't read them (the JSON is still flat-keyed, not nested). Step D rewrites Resources/config.json to nested form, which reactivates non-Default theme view-facade overrides for all theme-overlay POCOs uniformly via the existing BindThemeScope<ButtonSettings> / <DialogSettings> / etc. calls in TuiConfigurationBuilder.ApplyToStaticFacades. Files changed ============= Terminal.Gui/Views/Button.cs (2 props) Terminal.Gui/Views/CheckBox.cs (1 prop) Terminal.Gui/Views/CharMap/CharMap.cs (1 prop) Terminal.Gui/Views/Dialog.cs (4 props) Terminal.Gui/Views/FrameView.cs (1 prop) Terminal.Gui/Views/HexView.cs (1 prop) Terminal.Gui/Views/LinearRange/LinearRangeDefaults.cs (1 prop) Terminal.Gui/Views/Menu/Menu.cs (1 prop) Terminal.Gui/Views/Menu/MenuBar.cs (1 prop) Terminal.Gui/Views/MessageBox.cs (2 props) Terminal.Gui/Views/Selectors/SelectorBase.cs (1 prop) Terminal.Gui/Views/StatusBar.cs (1 prop) Terminal.Gui/Views/TextInput/TextField/TextField.cs (1 prop) Terminal.Gui/Views/TextInput/TextView/TextView.cs (1 prop) Terminal.Gui/Views/Window.cs (2 props) All ThemeScope-scoped view-facade props converted; total 21 properties across 15 files. Pattern per property: Before: /// <summary>...</summary> [ConfigurationProperty (Scope = typeof (ThemeScope))] public static T Name { get => XSettings.Current.Name; set => XSettings.Current = XSettings.Current with { Name = value }; } After: /// <summary>...</summary> public static T Name => XSettings.Current.Name; Out of scope ============ SettingsScope-scoped [ConfigurationProperty] on view classes (FileDialog.MaxSearchResults, FileDialogStyle.DefaultUseColors, MenuBar.DefaultKey, PopoverMenu.DefaultKey, View.DefaultMouseBindings, View.ViewMouseBindings, BorderView.DefaultMouseBindings) are NOT touched. SettingsScope follows the mutable-Defaults pattern (per A2.1's divergence note in specs/remove-legacy-cm.md §4.2) and remains CM-managed until step D. Terminal.Gui/Configuration/ConfigPropertyHostTypes.cs - Drops 14 entries (typeof + matching [DynamicDependency]) for types whose only [ConfigurationProperty] attrs were ThemeScope and are therefore now empty hosts: Button, CharMap, CheckBox, Dialog, FrameView, HexView, LinearRangeDefaults, Menu, MessageBox, SelectorBase, StatusBar, TextField, TextView, Window. - Keeps entries that still hold SettingsScope [ConfigurationProperty]: FileDialog, FileDialogStyle, MenuBar, PopoverMenu, View, BorderView, plus the unchanged Application / Color / Driver / Key / Trace / ConfigurationManager / SchemeManager / ThemeManager facades. Tests/UnitTestsParallelizable/Configuration/ScopeJsonConverterTests.cs - Drops the one InlineData row that exercised CM's ScopeJsonConverter with `"Dialog.DefaultButtonAlignment": "End"` (Dialog.DefaultButtonAlignment is one of the 21 properties this commit removes [ConfigurationProperty] from; the converter now rejects the key as Unknown). Comment notes the rationale and the expected removal alongside CM in step D. Sibling InlineData rows that don't reference dropped facade props continue to test the converter. Test results ============ Tests/UnitTestsParallelizable: total 17291 / 17271 passed / 0 failed / 20 skipped (one fewer test row vs. A2.3 baseline because the ScopeJsonConverter InlineData row was removed by design; no failures, no new skips, ConfigPropertyHostTypes drift-detector still green because it tracks reflected hosts and we removed matching list entries in lockstep). Tests/UnitTests.NonParallelizable: total 74 / 72 passed / 0 failed / 2 skipped (unchanged). Design context ============== This is commit A2.4 of the A2 series (POCO ownership migration on PR #5416, stacked on copilot/replace-cm-with-mec). A2.1 (2f7c13a) landed the 17 ThemeScope POCOs and BindThemeScope<T>. A2.2 (441ef60) landed GlyphSettings + Glyphs facade. A2.3 (f85e930) mopped up NerdFonts. A2.4 finishes the series by removing the dead view-facade setter scaffolding. A2 status: complete. The cleared-out view-facade properties leave ButtonSettings, CheckBoxSettings, DialogSettings, FrameViewSettings, etc. as the sole owners of theme-overlayed state; MecThemeManager mutates `<X>Settings.Current` exclusively via BindThemeScope<T> intra-assembly; consumer reads go through the bare expression-bodied getters on the view facades or directly through `<X>Settings.Current`. Cross-session review (PR #5411 owner) signed off on: - Removal of public static setters on view facades; "zero external callers" audit accepted. - Inheriting the A2.2 dormancy framing — Dark/Light/etc. theme overrides for view facades are dormant from A2.4 through step D's config.json rewrite. Same window as Glyphs. Deferred to step D / later commits ================================== - Resources/config.json rewrite to nested form (B/D). - CM deletion (D). - BindThemeScope<T> [UnconditionalSuppressMessage] re-justification once ConfigPropertyHostTypes goes (D). - ThemeSettings record + Current conversion (future micro-commit). - Mec* prefix drops on the manager types (post-D). Refs: A2.1 = 2f7c13a, A2.2 = 441ef60, A2.3 = f85e930, stacked on copilot/replace-cm-with-mec. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address #5416 CR feedback test-first and rewrite configuration docs. Preserve checkbox glyph defaults; SwitchTheme applies overlays without resetting to the config theme; bind Rune scalars; collapse empty Themes arrays; replace ConfigurationManager docs with TuiConfigurationBuilder. * Fix follow-up review: ThemeChanged after overlay, public Current, legacy-shape warning, case-insensitive SwitchTheme. * Complete Phase D/E: nested config.json, delete ConfigurationManager, rewire ThemeManager/SchemeManager to MEC. * Complete remaining #5416 phases F-I: dotted RuntimeConfig overlay, rename Mec* tests, NativeAOT size. Nested library Driver/Key/PopoverMenu sections skipped BindFlatDottedKeys, so RuntimeConfig dotted keys lost. Always overlay dotted keys after nested Bind. Phase F keeps MecThemeManager/MecSchemeManager because static ThemeManager/SchemeManager facades collide. Test files renamed. NativeAotSmoke win-arm64: 23.50 MB to 23.08 MB (-1.78%). * Fixes #5631 - Update tui-config-schema.json to nested MEC shape. The hosted schema is this in-repo file (docs publish). It still described flat keys, array Themes, and ConfigurationManager.ThrowOnJsonErrors. Nested sections now match Settings POCOs; Themes/Schemes are dictionaries. * Collapse dual-stack configuration: nested-only bind, one theme switch path. Binder no longer parses dotted keys or array-Themes (warn + MigrateConfig). ThemeCatalog owns names/Find. TrySwitchTheme publishes overlays then ThemeChanged. SchemeManager implements ISchemeManager; MecSchemeManager and unused ThemeDefinition are gone. Rune bind uses RuneJsonConverter. * Align shipped docs with nested MEC configuration. Replace leftover ConfigurationProperty / dotted-key / ConfigLocations wording in docfx, lexicon, CONTRIBUTING, primers, and UICatalog help. Key bindings and ViewKeyBindings are documented as code-only. Specs are marked historical. * Fix ultrareview findings test-first: resilient config load, CWD paths, scheme merge. Fixes the 10 confirmed code-review findings on this branch, each with tests written first (25 new tests across 5 new files plus additions to 2): - Config sources can no longer crash the app at assembly load: inline and embedded JSON is validated before adding, user files get a load-exception handler, Build() falls back to library defaults, and the module initializer catches. TuiJsonErrors now has real callers, so Print() at shutdown works. - ./.tui/ config files resolve against the current directory (injectable via new currentDirectory parameters), not the app's install directory. - SchemeManager.ApplyFromConfiguration preserves runtime-added schemes and deep-merges root Schemes with the theme overlay (root-then-overlay contract); invalid scheme JSON is reported via TuiJsonErrors instead of swallowed. - ApplyToStaticFacades raises ThemeManager.ThemeChanged when the config's Theme key changes the active theme. - Legacy-shaped sources (files, TUI_CONFIG, RuntimeConfig, app-embedded) are actually skipped, making the existing warning truthful; unreadable files no longer throw; ThemeCatalog no longer filters numeric theme names. - UICatalog's config-file watcher reloads and re-applies (new TuiConfigurationBuilder.Reload) instead of only logging. - MenuBar.DefaultKey app-set values survive theme switches via an override. - MigrateConfig deep-merges mixed dotted and nested keys instead of dropping settings order-dependently. - Glyph strings parse glyph-first, so "6" is '6' while legacy numeric codepoints (e.g. 9733) still work. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NGq38GbuZPAEa5wZHkmPiZ * Restore nested JSON overlays for DefaultKeyBindings. Key bindings were ConfigurationProperty in 2.4 and were silently dropped after the MEC migration because they are not Settings POCO properties. ApplyToStaticFacades now overlays Application.DefaultKeyBindings, View.DefaultKeyBindings, and View.ViewKeyBindings from nested JSON. ConfigurationSectionJson rebuilds MEC index children as JSON arrays so PlatformKeyBinding.All deserializes. Unmentioned commands keep hard-coded defaults. * Simplify key-binding JSON bind after review. Remove the global JsonStringEnumConverter from TuiSerializerContext; Command-name dictionary keys already deserialize with the default enum converter. Move STJ deserialize onto ConfigurationSectionJson and overlay ViewKeyBindings through the same command-dict merge. Treat MEC children as a JSON array only when keys are exactly 0..n-1. * Fix hot-reload review findings: per-source resilience, overlay revert, atomic arrays. Addresses the 10 code-review findings on the reload/re-apply path: - AddTuiInlineJson rejects non-object roots and duplicate-key JSON at add time (single parse), so one bad TUI_CONFIG/RuntimeConfig source is skipped per-source instead of throwing inside builder.Build() and discarding every source. User files now flow through the same validated inline path, replacing the file-load exception handler. - TuiConfigurationBuilder builds a raw-JSON merged view of all sources (JsonMerge: objects merge, arrays replace wholesale). Key bindings and schemes bind from it, so a higher-priority source's shorter array atomically replaces a lower-priority source's instead of inheriting MEC's per-index tail merge. - KeyBindingConfiguration records what each config overlay replaced and reverts it before re-applying, so a binding removed from config regains its default on reload ("unmentioned commands keep hard-coded defaults" now holds across Reload). App-code mutations are preserved. - ApplyToStaticFacades always raises ThemeManager.ThemeChanged - a hot reload that edits the current theme's content now repaints instead of updating facades invisibly. - PopoverMenu.DefaultKey gets the same app-override treatment as MenuBar.DefaultKey (the previous fix missed its only sibling). - SchemeManager tracks runtime AddScheme entries explicitly, so updates to existing schemes survive re-apply like added schemes do; scheme binding and deep-merge now use the shared ConfigurationSectionJson/JsonMerge helpers instead of hand-rolled clone/merge/deserialize copies. - TuiJsonErrors clears at the start of each build, so a watcher re-applying a persistently malformed source reports it once, not unboundedly. - UICatalog's config watcher debounces (250ms), wraps the reload in try/catch, and disposes its timer on stop - a bad config value can no longer kill the process from the watcher thread. - Config tests use a builder that skips user files and TUI_CONFIG (internal includeUserSources ctor), so machine-local configuration cannot change test outcomes. Tests: 227 Configuration tests (10 new) plus full suites pass: 17,560 parallelizable, 32 non-parallelizable, 437 integration. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NGq38GbuZPAEa5wZHkmPiZ * Fixes #5636 - Scope MainLoopSyncContext to running sessions (await-before-RunAsync deadlock) (#5641) * Fixes #5636 - Scope MainLoopSyncContext to running sessions to unblock await-before-RunAsync. Since #5588, Init installed the app's MainLoopSyncContext as the calling thread's ambient SynchronizationContext. Any await between Init and Run/RunAsync then captured a context whose Post queues onto the main loop - which is not running yet - so the continuation (the code about to start the loop) was stranded and the app hung at startup. ConfigureAwait(false) avoided the capture, matching the workaround shipped in tui-cs/clet. - Init creates the context but no longer installs it as ambient; Begin still installs it for the duration of a session, so awaits inside event handlers keep marshaling to the main loop (the #5579 contract). - Run saves the caller's ambient context and restores it on exit, so an await after Run cannot capture a context that stopped pumping. - ResetState clears the ambient context only when it is this app's own; a foreign (caller-owned) context is left untouched. - MainLoopSyncContext.Post/Send fall back to the thread pool / inline execution once the app is no longer Initialized - callbacks posted after Shutdown/Dispose execute instead of being stranded (previously Post threw NotInitializedException via Invoke). Test-first: RunAsync_AfterAwaitFollowingInit_DoesNotDeadlock reproduced the hang (10s timeout) before the fix and passes in ~2s after. New SyncContextLifecycleTests cover the Init/Run/Dispose ambient-context contract and the post-dispose Post fallback; existing tests that encoded the #5588 ambient-at-Init behavior were updated to the new contract. Suites: 17,564 parallelizable, 32 non-parallelizable, 437 integration - all pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NGq38GbuZPAEa5wZHkmPiZ * Address CR: restore ambient context for Begin/End sessions; pool fallback after sessions end. Codex/Copilot review of #5641 flagged two gaps in the session scoping: - The documented Begin/End building-block sequence installed the app context but never restored the caller's. Begin now saves the caller's ambient context on the SessionToken and End restores it (guarded so a foreign thread's context is never clobbered); for nested sessions the outermost End restores the caller's context. - Post/Send gated only on Initialized, so a continuation captured during a session that resumed after End was queued onto a loop that may never pump again. They now gate on CanPumpPostedWork: pump while a session is running, or before the first Run completes (preserving the documented post-Init/pre-Run queueing); otherwise fall back to the thread pool / inline execution. Test-first: Begin_End_RestoresAmbientSyncContext_IncludingNestedSessions and Post_AfterSessionEnded_StillExecutesCallback both failed before the change and pass after. Suites: 17,566 parallelizable, 32 non-parallelizable, 437 integration - all pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NGq38GbuZPAEa5wZHkmPiZ --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> * Harden Post-after-session thread-pool wait for Ubuntu parallel CI. The Ubuntu Parallel Unit Tests job failed on Post_AfterSessionEnded_StillExecutesCallback with a 2s ManualResetEventSlim timeout. After a session ends, Post correctly falls back to the thread pool; under parallel xunit load that callback can take longer than 2s to run. Increase the wait, assert CanPumpPostedWork is false, and dispose the app if the assertion fails. Co-authored-by: Tig <tig@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Point v1 ConfigurationManager users at TuiConfigurationBuilder, add a 2.5.0 breaking-changes conceptual page, align the README develop increment with GitVersion.yml Patch, and correct Schemes.Resolve to SchemeManager.GetScheme in the primer and llms.txt. Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Parse glyph/U+hex/\u config strings directly instead of SerializeToUtf8Bytes + JsonSerializerOptions.Default, which ILC flags as IL2026 for AOT consumers (tig/winprint#272). Co-authored-by: Cursor Agent <cursoragent@cursor.com>
…5657) * Fixes #5635. Hide active popover on DeRegister DeRegister cleared the active popover without Hide, so SetNeedsDraw never ran. Keyboard Enter with a handled Accepting handler that moved focus took that path and left the dropped list's cells behind. Co-authored-by: Tig <tig@users.noreply.github.com> * test: assert covered views are invalidated after handled Enter The buffer-only check still passed without the fix because a later draw could hide the stale cells. Assert NeedsDraw on the dialog and the covered label immediately after Enter. Co-authored-by: Tig <tig@users.noreply.github.com> * fix: do not leave a re-shown popover active after DeRegister Hide raises VisibleChanged. A handler can call Show and restore _activePopover before DeRegister returns. Clear that pointer after unregistering so the popover cannot stay active and unregistered. Co-authored-by: Tig <tig@users.noreply.github.com> * Fixes #5635 follow-up. Unregister popover before Hide on DeRegister A VisibleChanged handler could call Show during Hide while the popover was still registered, leaving it visible. The new test failed on that order. DeRegister now removes from the registry first, then Hide, so Show cannot run. SetNeedsDraw still happens for #5635. Co-authored-by: Tig <tig@users.noreply.github.com> * fix: harden WaitIteration against null CTS on shutdown WaitIteration used ExternalCancellationTokenSource! during Stop/Dispose. CleanupApplication can already have nulled that source, which produced the macOS IntegrationTests NRE on WithListView_NavigatesItems. Co-authored-by: Tig <tig@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Member
Author
|
Release PR for v2.5.0-beta.1 (#5630 Workstream 5).
Do not merge ecosystem canaries until after this package is on nuget.org, then swap their pin from |
65 of 66 tasks
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 55d57eac7b
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| bool wasExecuted = false; | ||
| Exception? error = null; | ||
|
|
||
| _app.Invoke (() => |
There was a problem hiding this comment.
When a worker calls Send while a session is stopping, CanPump can return true and the UI thread can complete End before this subsequent Invoke enqueues the callback. No loop then drains the timed event, so Send waits forever on gate; the same race can strand callbacks submitted by Post. Coordinate the pump-state check and enqueue with session shutdown, or make End drain/reject work queued during this transition.
Useful? React with 👍 / 👎.
Comment on lines
302
to
+306
| // Do the work | ||
| _selectedColor = value; | ||
|
|
||
| // Keep Text in sync with the new color | ||
| SetTextDirect (_selectedColor.ToString ()); |
There was a problem hiding this comment.
A newly constructed ColorPicker starts with _selectedColor == Color.Black, and ApplyStyleChanges assigns that same value, so this unequal-value branch is skipped and the newly inherited View.Text remains empty. Before this change the overridden getter always returned SelectedColor.ToString(), meaning new ColorPicker().Text represented black; initialize the backing text even when the selected color has not changed.
Useful? React with 👍 / 👎.
Comment on lines
+46
to
+48
| protected override void OnTextChanged () | ||
| { | ||
| get | ||
| { | ||
| string body = string.Join ("\n", CodeLines); | ||
| ParseFencedText (Text); |
There was a problem hiding this comment.
Replacing the computed Text override with this hook leaves the base text as only the last string assigned through Text. If callers subsequently set CodeLines, Language, or internal StyledLines, the rendered block changes but Text remains stale (and blocks populated through StyledLines can report an empty string); previously the getter reconstructed the current content from CodeLines and Language. Update the base backing text whenever those content properties change.
Useful? React with 👍 / 👎.
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
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.
Release v2.5.0-beta.1
This is a beta pre-release.
Version:
2.5.0-beta.1NuGet Package:
Terminal.Gui 2.5.0-beta.1What happens when this PR is merged
v2.5.0-beta.1main→developwill be openedChecklist
2.5.0-beta.1