Skip to content

Safe mode: fix panic when annotation doesn't have a name #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanLovato merged 1 commit into from
Oct 10, 2025
Merged

Safe mode: fix panic when annotation doesn't have a name #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/formatter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ impl Formatter {
.unwrap();
let tree = parser.parse(&content, None).unwrap();
let mut input_tree = GdTree::from_ts_tree(&tree, content.as_bytes());
input_tree.postprocess();

Self {
content,
Expand Down Expand Up @@ -145,6 +144,7 @@ impl Formatter {
#[inline(always)]
fn finish(mut self) -> Result<String, Box<dyn std::error::Error>> {
if self.config.safe {
self.input_tree.postprocess();
self.tree = self.parser.parse(&self.content, None).unwrap();

let output_tree = GdTree::from_ts_tree(&self.tree, self.content.as_bytes());
Expand Down Expand Up @@ -587,8 +587,9 @@ impl GdTree {
if child.grammar_name != "annotation" {
return None;
}
let annotation_name =
self.nodes[child.children[0]].text.as_deref().unwrap();
let Some(annotation_name) = &self.nodes[child.children[0]].text else {
return None;
};
if annotation_name != "onready" && annotation_name != "export" {
return None;
}
Expand Down