Improves XAML code gen (Error reporting + HR) #21867
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a potential ENC0004 error during Hot Reload by conditionally removing the static modifier from generated template builder methods when HR is enabled. The PR also enhances error handling by supporting multiple parsing errors per file and adds validation for RelativeSource bindings in XAML.
Key Changes
- Removes
staticmodifier from template builder methods when Hot Reload is enabled to prevent ENC0004 errors - Refactors error handling from single to multiple errors per XAML file
- Adds validation for RelativeSource binding syntax and properties
- Includes cache key updates to account for source link variations
Reviewed Changes
Copilot reviewed 26 out of 57 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
XamlFileGenerator.cs |
Conditionally generates instance methods instead of static when HR is enabled; adds RelativeSource validation |
XamlFileDefinition.cs |
Changes from single ParsingError to ParsingErrors collection; makes SourceLink required in constructor |
XamlFileParser.cs |
Refactors to use XamlFileParserContext for error collection; adds missing comma detection in bindings |
XamlFileParserContext.cs |
New class for collecting multiple parsing errors during XAML parsing |
XamlCodeGeneration.cs |
Updates to iterate over multiple errors instead of single error |
XamlFileParser.Cache.cs |
Adds Link to cache key to differentiate files with same content but different links |
| Test files | Multiple new tests for error scenarios and Hot Reload scenarios; updated expected outputs |
Contributor
|
🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-21867/docs/index.html |
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-21867/wasm-skia-net9/index.html |
5 tasks
Contributor
|
🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-21867/docs/index.html |
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-21867/wasm-skia-net9/index.html |
Contributor
|
The build 183567 found UI Test snapshots differences: Details
|
5 tasks
Member
Author
|
About relevant comments from copilot: they are addressed in a coming PR #21874 |
Xiaoy312
approved these changes
Nov 18, 2025
Contributor
|
@mergify backport release/stable/6.4 |
Contributor
✅ Backports have been createdDetails
|
5 tasks
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.
closes #21860
closes https://github.com/unoplatform/uno.hotdesign/issues/5418
✨ Feature / 🐞 Bugfix
✨ Add ability to pass over invalid binding syntax in code gen
🐞Fix possible ENC0004 with HR
What is the current behavior? 🤔
What is the new behavior? 🚀
staticmethod.PR Checklist ✅
Screenshots Compare Test Runresults.Other information ℹ️
This PR is based on #21865 (and contains same changes)