fix(hql): Correct diagnostic file content rendering and add filepath to schema parsing methods #429
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.
Description
Problem
Diagnostics displayed incorrect line content because the diagnostic renderer used combined source content instead of the specific file content where the error occurred.
Before (incorrect):
error[E204]: field `Label` is a reserved field name ┌─ /home/pro/test/helix/second/queries.hx:3:6 │ 3 │ RETURN friends ← Wrong content from query.hx file instead of the schema.hx │ ^^^^^^^^^^^^^
Solution
Added filepath parameter to schema parsing methods (parse_field_def, parse_node_body, parse_properties)
Updated diagnostic rendering in helix-cli/src/utils.rs to find the correct file content by matching the diagnostic's filepath:
After (correct):
summary
• Added filepath parameter to schema parsing methods (parse_field_def, parse_node_body, parse_properties)
• Updated location creation to use loc_with_filepath(filepath) instead of loc()
• Fixed diagnostic rendering to use individual file content matching the diagnostic's filepath
• Updated CLI integration to pass Content structure for proper file access
Related Issues
None
Checklist when merging to main
rustfmt
helix-cli/Cargo.toml
andhelixdb/Cargo.toml
Additional Notes
None