Skip to content

fix: avoid panics on Jinja-templated SQL with config()/source() blocks #2571

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

Open
kimfrie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid panics on Jinja-templated SQL with config()/source() blocks #2571

Show file tree
Hide file tree
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
25 changes: 19 additions & 6 deletions crates/lib-core/src/parser/segments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,15 +408,28 @@ impl ErasedSegment {

let pos_marker = self.get_position_marker().unwrap();
if pos_marker.is_literal() && !has_descendant_source_fixes {
let templated_str = templated_file.templated_str.as_ref().unwrap();
let templated_slice = pos_marker.templated_slice.clone();
let source_slice = pos_marker.source_slice.clone();

// Skip patch if the position marker's slices are malformed.
let templated_len = templated_str.len();
let source_len = templated_file.source_str.len();
let templated_ok = templated_slice.start <= templated_slice.end
&& templated_slice.end <= templated_len;
let source_ok =
source_slice.start <= source_slice.end && source_slice.end <= source_len;
if !templated_ok || !source_ok {
return acc;
}

acc.extend(self.iter_source_fix_patches(templated_file));
acc.push(FixPatch::new(
pos_marker.templated_slice.clone(),
templated_slice.clone(),
self.raw().clone(),
// SyntaxKind::Literal.into(),
pos_marker.source_slice.clone(),
templated_file.templated_str.as_ref().unwrap()[pos_marker.templated_slice.clone()]
.to_string(),
templated_file.source_str[pos_marker.source_slice.clone()].to_string(),
source_slice.clone(),
templated_str[templated_slice].to_string(),
templated_file.source_str[source_slice].to_string(),
));
} else if self.segments().is_empty() {
return acc;
Expand Down
11 changes: 8 additions & 3 deletions crates/lib/src/utils/reflow/elements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,16 +260,21 @@ impl ReflowPoint {

let new_indent = SegmentBuilder::whitespace(tables.next_id(), desired_indent);

let (last_newline_idx, last_newline) = self
// No literal newline => all newlines are templated; emit no fix.
let Some((last_newline_idx, last_newline)) = self
.segments
.iter()
.enumerate()
.rev()
.find(|(_, it)| {
it.is_type(SyntaxKind::Newline)
&& it.get_position_marker().unwrap().is_literal()
&& it
.get_position_marker()
.is_some_and(|pm| pm.is_literal())
})
.unwrap();
else {
return (Vec::new(), self.clone());
};

let mut new_segments = self.segments[..=last_newline_idx].to_vec();
new_segments.push(new_indent.clone());
Expand Down