* Initial plan * Add comprehensive terminology proposal for Application.Top/Toplevel renaming Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add terminology proposal summary document Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add before/after comparison document for terminology proposal Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add index document for terminology proposal Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add Mermaid diagrams visualizing the terminology proposal Co-authored-by: tig <585482+tig@users.noreply.github.com> * Move terminology docs to docfx/docs per CONTRIBUTING.md guidelines Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update terminology proposal to reflect recent modernization (post-MainLoop removal) Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update terminology proposal - validate against recent driver refactoring changes Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update proposal after massive v2_develop modernization - TopLevels now public, RunState→SessionToken Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update proposal: RunStack → SessionStack to align with SessionToken terminology Co-authored-by: tig <585482+tig@users.noreply.github.com> * Phase 1: Core API rename - Application.Top→Current, TopLevels→SessionStack Co-authored-by: tig <585482+tig@users.noreply.github.com> * Phase 2: Fix test compilation errors for renamed properties Co-authored-by: tig <585482+tig@users.noreply.github.com> * Phase 3: Update documentation files with new terminology Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor generic type names and remove unused field Renamed generic type parameters in `Dim` and `Pos` classes for clarity: - `T` was renamed to `TDim` in `Dim.Has` method. - `T` was renamed to `TPos` in `Pos.Has` method. Updated type casting and pattern matching logic to reflect these changes. Removed the unused `_stopAfterFirstIteration` field from the `ApplicationImpl` class to clean up the codebase. * Increase minimum code coverage target to 75% Updated the `codecov.yml` configuration file to raise the `project.default.target` value from 70% to 75%, enforcing stricter code coverage requirements for the overall project. * Add comprehensive unit tests for ApplicationImpl Begin/End logic Added ApplicationImplBeginEndTests with 16 tests covering: - Begin/End argument validation - SessionStack push/pop operations - Current property management - Balanced Begin/End enforcement - Multiple nested Begin/End scenarios - ResetState cleanup behavior - Toplevel activation/deactivation - SessionToken management Tests validate the fragile state management logic in ApplicationImpl.Lifecycle.cs and ApplicationImpl.Run.cs to catch regressions in Current/SessionStack handling. Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor ApplicationImplBeginEndTests to work with ApplicationImpl instances directly Tests now: - Create ApplicationImpl instances directly instead of using global Application - Use try-finally blocks to ensure Shutdown() is always called - Work with app.Init() and app.Shutdown() properly - 13 of 16 tests passing (3 tests need adjustment for ResetState behavior) Tests validate fragile Begin/End state management logic without polluting global Application state. Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix ApplicationImplBeginEndTests: Remove explicit ResetState calls, rely on Shutdown Per maintainer feedback: - Tests should not call ResetState explicitly if they call Shutdown (Shutdown calls ResetState) - Removed all explicit app.ResetState() calls from tests - Tests now only call Shutdown in finally blocks for cleanup - Ensured toplevels are disposed BEFORE Shutdown to satisfy DEBUG_IDISPOSABLE assertions - Fixed test cleanup order to prevent ResetState assertion failures - All 16 tests now pass successfully ResetState is idempotent - the issue was tests calling it unnecessarily and with incorrect disposal ordering. Co-authored-by: tig <585482+tig@users.noreply.github.com> * Phase 1: Enable nullable by default, add directives to all files - Added <Nullable>enable</Nullable> to Terminal.Gui.csproj - Removed #nullable enable from 37 files (now redundant with project setting) - Added #nullable disable to 170 files that don't have nullable enabled yet - Build successful with 279 nullable warnings (expected) Breakdown of files with #nullable disable: - 27 in Views/ directory (will remain disabled per plan) - 143 outside Views/ (need to be fixed in subsequent commits) Next: Systematically fix nullable issues in non-View files. Co-authored-by: tig <585482+tig@users.noreply.github.com> * Phase 2: Remove nullable disable from all non-View files - COMPLETE! - Removed #nullable disable from 142 non-View files - All non-View code is now nullable-enabled - Build successful with 0 errors, only 1 unrelated warning - Created NULLABLE_VIEWS_REMAINING.md documenting the 121 View files still with nullable disable Nullable cleanup summary: ✅ App/: 25 files - nullable enabled ✅ Configuration/: 24 files - nullable enabled ✅ ViewBase/: 30 files - nullable enabled ✅ Drivers/: 25 files - nullable enabled ✅ Drawing/: 18 files - nullable enabled ✅ FileServices/: 7 files - nullable enabled ✅ Input/: 6 files - nullable enabled ✅ Text/: 5 files - nullable enabled ✅ Resources/: 3 files - nullable enabled ⏸️ Views/: 121 files - remain disabled (as requested) Total: 143 files nullable-enabled, 121 View files remain disabled. Co-authored-by: tig <585482+tig@users.noreply.github.com> * WIP: fixing nullability issues. * Fixed final nullability issues. * Moved Arrangment tests * Refactor and improve modularity across multiple classes Refactored `FillRectangles` in `RegionScenario` and `Region` to accept an `IDriver` parameter, reducing reliance on global state. Updated `ApplicationImpl` to replace static method calls with instance methods for better encapsulation. Renamed `Toplevel` to `Current` in `IPopover` and related classes for clarity. Simplified `LineCanvas` methods by removing unnecessary `IDriver` parameters. Added `Id` and `App` properties to `View` for better state management and unique identification. Streamlined the `Driver` property in `View` with a concise getter. Improved formatting and consistency across files, including `Region` and `IntersectionRuneResolver`. Enhanced thread safety in `Region` and cleaned up redundant code. Updated tests to align with interface changes and ensure compatibility. * Refactor to make IDriver dependency explicit Updated `AnsiEscapeSequenceRequest.Send` to accept an `IDriver?` parameter, replacing reliance on `Application.Driver`. Refactored `AnsiRequestScheduler` methods (`SendOrSchedule`, `RunSchedule`, and private `Send`) to propagate the `IDriver?` parameter, ensuring explicit driver dependency. Modified `DriverImpl.QueueAnsiRequest` to pass `this` to `SendOrSchedule`. Updated `AnsiRequestSchedulerTests` to reflect new method signatures, passing `null` for the driver parameter where applicable. Added `<param>` documentation for new parameters to improve clarity. These changes enhance flexibility, maintainability, and testability by reducing reliance on global state and allowing driver substitution in tests. * WIP: Started migrating to View.App Refactored `ApplicationImpl` to ensure proper handling of the `App` property for `Toplevel` instances, improving modularity. Replaced direct references to `Application` with `App` in `Border`, `ShadowView`, and other classes to enhance flexibility and maintainability. Introduced `GetApp` in `View` to allow overrides for retrieving the `App` instance. Updated `Adornment` to use this method. Moved mouse event subscriptions in `Border` to `BeginInit` for proper lifecycle management. Updated unit tests in `ArrangementTests` to use `App.Mouse` instead of `Application.Mouse`, ensuring alignment with the refactored design. Added `BeginInit` and `EndInit` calls for proper initialization during tests. Removed redundant code and improved test assertions. * WIP: Next set of View.App changes Updated `SetClipToScreen`, `SetClip`, and `GetClip` methods to accept an `IDriver` parameter, replacing reliance on the global `Application.Driver`. This improves modularity, testability, and reduces implicit global state usage. - Updated `Driver` property in `View` to use `App?.Driver` as fallback. - Refactored `DimAuto` to use `App?.Screen.Size` with a default for unit tests. - Updated all test cases to align with the new method signatures. - Performed general cleanup for consistency and readability. * Adds View clip tests. * Merged * Merged * wip * Fixed test bug. * Refactored Thickness.Draw to require driver. * Made TextFormatter.Draw require driver. * Code cleanup. * Un did stoopid idea. * Decouped Application.Navigation * MASSIVE - Almost completely decoupled Application from View etc... * Obsolete * Missed some * More cleanup and decoupling. Refactor `ToString` and remove legacy code Refactored `ToString` implementations across `Application`, `DriverImpl`, and `IDriver` to improve consistency and maintainability. Removed the legacy `ToString(IDriver? driver)` method and its associated references. Simplified `ToString` in `DriverImpl` to generate a string representation of the `Contents` buffer. Replaced redundant XML documentation with `<inheritdoc/>` tags to reduce duplication. Cleaned up unused `global using` directives and removed deprecated methods and properties, including `Screen`, `SetCursorVisibility`, and `IsRuneSupported`. Updated test cases in `GuiTestContext` and `DriverAssert` to use the new `ToString` implementation. Improved error messages for better debugging output. Streamlined LINQ queries and removed redundant checks for better readability and performance. Enhanced maintainability by decluttering the codebase, aligning namespaces, and consolidating related changes. * Changes before error encountered Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update docfx/docs to document View.App architecture and instance-based patterns Updated 16 documentation files to reflect the major architectural changes: NEW FILES: - application.md: Comprehensive deep dive on decoupled Application architecture UPDATED FILES: - View.md: Documents View.App property, GetApp(), and instance-based patterns - navigation.md: Shows View.App usage instead of static Application - drivers.md: Documents View.Driver and GetDriver() patterns - keyboard.md: Event handling through View.App - mouse.md: Mouse event handling via View.App - arrangement.md: Updated code examples to use View.App - drawing.md: Rendering examples with instance-based API - cursor.md: Cursor management through View.App - multitasking.md: SessionStack and session management via View.App - Popovers.md: Popover patterns with View.App - cancellable-work-pattern.md: Updated examples - command.md: Command pattern with View.App context - config.md: Configuration access through View.App - migratingfromv1.md: Migration guide for static→instance patterns - newinv2.md: Documents new instance-based architecture All code examples now demonstrate the instance-based API (view.App.Current) instead of obsolete static Application references. Documentation accurately reflects the massive architectural decoupling achieved in this PR. Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add `ToAnsi` support for ANSI escape sequence generation Introduced `ToAnsi` in `IDriver` and `IOutput` interfaces to generate ANSI escape sequences representing the terminal's current state. This enables serialization of terminal content for debugging, testing, and exporting. Implemented `ToAnsi` in `DriverImpl` and `FakeOutput`, supporting both 16-color and RGB modes. Refactored `OutputBase` with helper methods `BuildAnsiForRegion` and `AppendCellAnsi` for efficient ANSI generation. Enhanced `GuiTestContext` with `AnsiScreenShot` for capturing terminal state during tests. Added `ToAnsiTests` for comprehensive validation, including edge cases, performance, and wide/Unicode character handling. Updated documentation to reflect `ToAnsi` functionality and modernized driver architecture. Improved testability, modularity, and performance while removing legacy driver references. * Improve null safety and cleanup in GuiTestContext Enhanced null safety across `GuiTestContext` and `GuiTestContextTests`: - Replaced `a` with `app` for better readability in tests. - Added null checks (`!`, `?.`) to prevent potential null reference exceptions. - Removed redundant `WaitIteration` and duplicate `ScreenShot` calls. Improved error handling and robustness: - Updated shutdown logic to use null-safe calls for `RequestStop` and `Shutdown`. - Applied null-safe invocation for `_applicationImpl.Invoke`. General cleanup: - Removed redundant method calls and improved naming consistency. - Ensured better maintainability and adherence to best practices. * Refactor docs: remove deprecated files, update architecture Removed outdated documentation files related to the terminology proposal (`terminology-before-after.md`, `terminology-diagrams.md`, `terminology-index.md`, `terminology-proposal-summary.md`, `terminology-proposal.md`) from the `Docs` project. These files were either deprecated or consolidated into other documentation. Updated `application.md`: - Added a "View Hierarchy and Run Stack" section with a Mermaid diagram to illustrate the relationship between the view hierarchy and the application session stack. - Added a "Usage Example Flow" section with a sequence diagram to demonstrate the flow of running and stopping views. These changes improve clarity, streamline documentation, and align with the finalized terminology updates for the `Application.Current` and `Application.SessionStack` APIs. * Refactor Init/Run methods to simplify driver handling The `Init` method in `Application` and `IApplication` now accepts only an optional `driverName` parameter, removing the `IDriver` parameter. This simplifies initialization by relying on driver names to determine the appropriate driver. The `Run` methods have been updated to use `driverName` instead of `driver`, ensuring consistency with the updated `Init` method. Replaced redundant inline documentation with `<inheritdoc>` tags to improve maintainability and consistency. Legacy `Application` methods (`Init`, `Shutdown`, `Run`) have been marked as `[Obsolete]` to signal their eventual deprecation. Test cases have been refactored to align with the updated `Init` method signature, removing unused `driver` parameters. Documentation files have also been updated to reflect these API changes. These changes improve clarity, reduce complexity, and ensure a more consistent API design. * Refactor: Introduce Application.Create() factory method Introduced a new static method `Application.Create()` to create instances of `IApplication`, replacing direct instantiation of `ApplicationImpl`. This enforces a cleaner, recommended pattern for creating application instances. Made the `ApplicationImpl` constructor `internal` to ensure `Application.Create()` is used for instance creation. Refactored test cases across multiple files to use `Application.Create()` instead of directly instantiating `ApplicationImpl`. Simplified object initialization in tests using target-typed `new()` expressions. Updated documentation and examples in `application.md` to reflect the new instance-based architecture and highlight its benefits, such as supporting multiple applications with different drivers. Improved code readability, formatting, and consistency in tests and documentation. Aligned `ApplicationImplBeginEndTests` to use `IApplication` directly, adhering to the new architecture. * Added `Application.StopAll` and fixed coupling issues. Refactored `ApplicationImpl` to use an instance-based approach, replacing the static singleton pattern and Lazy<T>. Introduced `SetInstance` for configuring the singleton instance and updated tests to use `ApplicationImpl.Instance` or explicitly set the `Driver` property. Enabled nullable reference types across the codebase, updating fields and variables to nullable types where applicable. Added null checks to improve safety and prevent runtime errors. Refactored timeout management by introducing tokens for `Application.AddTimeout` and adding a `StopAll` method to `TimedEvents` for cleanup. Updated tests to use `System.Threading.Timer` for independent watchdog timers. Removed legacy code, improved logging for error cases, and updated view initialization to explicitly set `App` or `Driver` in tests. Enhanced test coverage and restructured `ScrollSliderTests` for better readability. Performed general code cleanup, including formatting changes, removal of unused imports, and improved naming consistency. * Refactor: Transition to IApplication interface Refactored the codebase to replace the static `Application` class with the `IApplication` interface, improving modularity, testability, and maintainability. Updated methods like `Application.Run`, `RequestStop`, and `Init` to use the new interface. Marked static members `SessionStack` and `Current` as `[Obsolete]` and delegated their functionality to `ApplicationImpl.Instance`. Updated XML documentation to reflect these changes. Simplified code by removing redundant comments, unused code, and converting methods like `GetMarginThickness` to single-line expressions. Improved null safety with null-conditional operators in `ToplevelTransitionManager`. Enhanced consistency with formatting updates, logging improvements, and better error handling. Updated `Shortcut` and other classes to align with the new interface-based design. Made breaking changes, including the removal of the `helpText` parameter in the `Shortcut` constructor. Updated `Wizard`, `Dialog`, and `GraphView` to use `IApplication` methods. Adjusted `ViewportSettings` and `HighlightStates` for better behavior. * Enhance null-safety and simplify codebase Improved null-safety by adopting nullable reference types and adding null-forgiving operators (`!`) where appropriate. Replaced direct method calls with null-safe calls using the null-conditional operator (`?.`) to prevent potential `NullReferenceException`. Removed default parameter values in test methods to enforce explicit parameter passing. Refactored test classes to remove unnecessary dependencies on `ITestOutputHelper`. Fixed a bug in `WindowsOutput.cs` by setting `_force16Colors` to `false` to avoid reliance on a problematic driver property. Updated `SessionTokenTests` to use null-forgiving operators for clarity in intentional null usage. Simplified graph and UI updates by ensuring safe access to properties and methods. Cleaned up namespaces and removed unused `using` directives for better readability. Updated `Dispose` methods to use null-safe calls and replaced nullable driver initialization with non-nullable initialization in `ScrollSliderTests` to ensure proper instantiation. * Refactor test code to use nullable `App` property Replaced direct `Application` references with `App` property across test classes to improve encapsulation and robustness. Updated `GuiTestContext` to use a nullable `App` property, replacing `_applicationImpl` for consistency. Refactored key event handling to use `App.Driver` and revised `InitializeApplication` and `CleanupApplication` methods to ensure safe usage of the nullable `App` property. Updated `Then` callbacks to explicitly pass `App` for clarity. Replaced `Application.QuitKey` with `context.App?.Keyboard.RaiseKeyDownEvent` to ensure context-specific event handling. Refactored `EnableForDesign` logic in `MenuBarv2Tests` and `PopoverMenuTests` to operate on the correct application instance. Improved null safety in test assertions and revised `RequestStop` and `Shutdown` calls to use `App?.RequestStop` and `App?.Shutdown`. Updated navigation logic to use `Terminal.Gui.App.Application` for namespace consistency. Enhanced exception handling in the `Invoke` method and performed general cleanup to align with modern C# practices, improving maintainability and readability. * Commented out exception handling in Application.Shutdown The `try-catch` block around `Application.Shutdown` was commented out, disabling the logging of exceptions thrown after a test exited. This change removes the `catch` block that used `Debug.WriteLine` for logging. The `finally` block remains intact, ensuring cleanup operations such as clearing `View.Instances` and resetting the application state are still executed. * Fixes #4394 - Changing Theme at Runtime does not Update Some Properties * Tweaks to config format. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Tig <tig@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com>
10 KiB
Fixes #4329 - Major Architectural Improvements: API Rename, Nullable Types, and Application Decoupling
Overview
This PR delivers three major architectural improvements to Terminal.Gui v2:
- API Terminology Modernization - Renamed confusing
Application.Top/TopLevelsto intuitiveApplication.Current/Session Stack - Nullable Reference Types - Enabled nullable for 143 non-View library files
- Application Decoupling - Introduced
View.Appproperty to decouple View hierarchy from static Application class
Impact: 561 files changed, 7,033 insertions(+), 2,736 deletions(-) across library, tests, and examples.
Part 1: API Terminology Modernization (Breaking Change)
Changes
Application.Top→Application.Current(684 occurrences across codebase)Application.TopLevels→Application.SessionStack(31 occurrences)- Updated
IApplicationinterface,ApplicationImpl, all tests, examples, and documentation
Rationale
The old naming was ambiguous and inconsistent with .NET patterns:
Topdidn't clearly indicate "currently active/running view"TopLevelsexposed implementation detail (it's a stack!) and didn't matchSessionTokenterminology
New naming follows established patterns:
CurrentmatchesThread.CurrentThread,HttpContext.Current,Synchronization Context.CurrentSessionStackclearly describes both content (sessions) and structure (stack), aligning withSessionToken
Impact Statistics
| Category | Files Changed | Occurrences Updated |
|---|---|---|
| Terminal.Gui library | 41 | 715 |
| Unit tests | 43 | 631 |
| Integration tests | 3 | 25 |
| Examples | 15 | 15 |
| Documentation | 3 | 14 |
| Total | 91 | ~800 |
###Breaking Changes
All references must be updated:
// OLD (v1/early v2)
Application.Top?.SetNeedsDraw();
foreach (var tl in Application.TopLevels) { }
// NEW (v2 current)
Application.Current?.SetNeedsDraw();
foreach (var tl in Application.SessionStack) { }
Part 2: Nullable Reference Types Enabled
Changes
Phase 1 - Project Configuration (commit 439e161):
- Added
<Nullable>enable</Nullable>toTerminal.Gui.csproj(project-wide default) - Removed redundant
#nullable enablefrom 37 files - Added
#nullable disableto 170 files not yet compliant
Phase 2 - Non-View Compliance (commit 06bd50d):
- Removed
#nullable disablefrom ALL 143 non-View library files - Build successful with 0 errors
- All core infrastructure now fully nullable-aware
Phase 3 - Cleanup (commits 97d9c7d, 49d4fb2):
- Fixed duplicate
#nullabledirectives in 37 files - All files now have clean, single nullable directive
Impact Statistics
| Directory | Files Nullable-Enabled |
|---|---|
| App/ | 25 ✅ |
| Configuration/ | 24 ✅ |
| ViewBase/ | 30 ✅ |
| Drivers/ | 25 ✅ |
| Drawing/ | 18 ✅ |
| FileServices/ | 7 ✅ |
| Input/ | 6 ✅ |
| Text/ | 5 ✅ |
| Resources/ | 3 ✅ |
| Views/ | 121 ⏸️ (documented in NULLABLE_VIEWS_REMAINING.md) |
| Total Enabled | 143 files |
Remaining Work
See NULLABLE_VIEWS_REMAINING.md for the 121 View subclass files still with #nullable disable. These require careful migration due to complex view hierarchies and will be addressed in a follow-up PR.
Part 3: Application Decoupling (MASSIVE Change)
Problem
Prior to this PR, Views were tightly coupled to the static Application class:
- Direct static calls:
Application.Current,Application.Driver,Application.MainLoop - Made Views untestable in isolation
- Violated dependency inversion principle
- Prevented Views from working with different IApplication implementations
Solution: View.App Property
Introduced View.App property that provides IApplication instance:
// Terminal.Gui/ViewBase/View.cs
public IApplication? App
{
get => GetApp();
internal set => _app = value;
}
private IApplication? GetApp()
{
// Walk up hierarchy to find IApplication
if (_app is { }) return _app;
if (SuperView is { }) return SuperView.App;
return Application.Instance; // Fallback to global
}
Migration Pattern
Before (tightly coupled):
// Direct static dependency
Application.Driver.Move(x, y);
if (Application.Current == this) { }
Application.MainLoop.Invoke(() => { });
After (decoupled via View.App):
// Use injected IApplication instance
App?.Driver.Move(x, y);
if (App?.Current == this) { }
App?.MainLoop.Invoke(() => { });
Impact Statistics
- 90 files changed in decoupling commit (
899fd76) - 987 insertions, 728 deletions
- Affects ViewBase, Views, Adornments, Input handling, Drawing
Benefits
✅ Testability: Views can now be tested with mock IApplication
✅ Flexibility: Views work with any IApplication implementation
✅ Cleaner Architecture: Follows dependency injection pattern
✅ Future-proof: Enables multi-application scenarios
✅ Maintainability: Clearer dependencies, easier to refactor
Known Remaining Coupling
After decoupling work, only 1 direct Application dependency remains in ViewBase:
Border.Arrangement.cs: UsesApplication.ArrangeKeyfor hotkey binding
Additional investigation areas for future work:
- Some Views still reference Application for convenience (non-critical)
- Test infrastructure may have residual static dependencies
- Example applications use Application.Run (expected pattern)
Part 4: Test Infrastructure Improvements
New Test File: ApplicationImplBeginEndTests.cs
Added 16 comprehensive tests validating fragile Begin/End state management:
Critical Test Coverage:
End_ThrowsArgumentException_WhenNotBalanced- Ensures proper Begin/End pairingEnd_RestoresCurrentToPreviousToplevel- Validates Current property managementMultipleBeginEnd_MaintainsStackIntegrity- Tests nested sessions (5 levels deep)
Additional Coverage:
- Argument validation (null checks)
- SessionStack push/pop operations
- Current property state transitions
- Unique ID generation for toplevels
- SessionToken management
- ResetState cleanup behavior
- Toplevel activation/deactivation events
Test Quality Improvements
All new tests follow best practices:
- Work directly with ApplicationImpl instances (no global Application pollution)
- Use try-finally blocks ensuring Shutdown() always called
- Properly dispose toplevels before Shutdown (satisfies DEBUG_IDISPOSABLE assertions)
- No redundant ResetState calls (Shutdown calls it internally)
Result: All 16 new tests + all existing tests passing ✅
Additional Changes
Merged from v2_develop
- RunState → SessionToken terminology (precedent for this rename)
- Application.TopLevels visibility changed to public (made this rename more important)
- Legacy MainLoop infrastructure removed
- Driver architecture modernization
- Test infrastructure improvements
Documentation
- Created 5 comprehensive terminology proposal documents in
docfx/docs/:terminology-index.md- Navigation guideterminology-proposal.md- Complete analysisterminology-proposal-summary.md- Quick referenceterminology-diagrams.md- 11 Mermaid diagramsterminology-before-after.md- Side-by-side examples
- Updated
navigation.md,config.md,migratingfromv1.md - Created
NULLABLE_VIEWS_REMAINING.md- Tracks remaining nullable work
Testing
- ✅ Build: Successful with 0 errors
- ✅ Unit Tests: All 16 new tests + all existing tests passing
- ✅ Integration Tests: Updated and passing
- ✅ Examples: UICatalog, ReactiveExample, CommunityToolkitExample all updated and functional
- ✅ Documentation: Builds successfully
Breaking Changes Summary
API Changes (Requires Code Updates)
-
Application.Top→Application.Current- All usages must be updated
- Affects any code accessing the currently running toplevel
-
Application.TopLevels→Application.SessionStack- All usages must be updated
- Affects code iterating over running sessions
Non-Breaking Changes
- Nullable reference types: Improved type safety, no runtime changes
- View.App property: Additive, existing Application. * calls still work (for now)
Migration Guide
For Terminology Changes
# Find and replace in your codebase
Application.Top → Application.Current
Application.TopLevels → Application.SessionStack
For View.App Usage (Recommended, Not Required)
When writing new View code or refactoring existing Views:
// Prefer (future-proof, testable)
App?.Driver.AddRune(rune);
if (App?.Current == this) { }
// Over (works but tightly coupled)
Application.Driver.AddRune(rune);
if (Application.Current == this) { }
Future Work
Nullable Types
- Enable nullable for remaining 121 View files
- Document nullable patterns for View subclass authors
Application Decoupling
- Remove last
Application.ArrangeKeyreference from Border - Consider making View.App property public for advanced scenarios
- Add documentation on using View.App for testable Views
Tests
- Expand ApplicationImpl test coverage based on new patterns discovered
- Add tests for View.App hierarchy traversal
Pull Request Checklist
- I've named my PR in the form of "Fixes #issue. Terse description."
- My code follows the style guidelines of Terminal.Gui
- My code follows the Terminal.Gui library design guidelines
- I ran
dotnet testbefore commit - I have made corresponding changes to the API documentation
- My changes generate no new warnings
- I have checked my code and corrected any poor grammar or misspellings
- I conducted basic QA to assure all features are working
Related Issues
- Fixes #4329 - Rename/Clarify Application.Toplevels/Top Terminology
- Related to #2491 - Toplevel refactoring
- Fixes #4333 (duplicate/related issue)
Note: This is a large, multi-faceted PR that delivers significant architectural improvements. The changes are well-tested and maintain backward compatibility except for the intentional breaking API rename. The work positions Terminal.Gui v2 for better testability, maintainability, and future enhancements.