Skip to content

Commit 131b38b

Browse files
wip
1 parent 9bd2ab9 commit 131b38b

13 files changed

+123
-929
lines changed

crates/djls-template-ast/src/ast.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,13 @@ mod tests {
361361

362362
// Check nodes
363363
eprintln!("Nodes: {:?}", nodes);
364-
assert_eq!(nodes.len(), 4);
365-
if let Node::Text { content, span } = &nodes[2] {
366-
assert_eq!(content, "Welcome!");
364+
assert_eq!(nodes.len(), 1);
365+
if let Node::Text { content, span } = &nodes[0] {
366+
assert_eq!(content, " Welcome!");
367367
eprintln!("Line offsets: {:?}", ast.line_offsets());
368368
eprintln!("Span: {:?}", span);
369369
let (line, col) = ast.line_offsets().position_to_line_col(span.start);
370-
assert_eq!((line, col), (2, 2), "Content should be on line 2, col 2");
370+
assert_eq!((line, col), (2, 0), "Content should be on line 2, col 0");
371371

372372
// Check closing tag
373373
if let Block::Closing { tag } =

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap

Lines changed: 4 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ nodes:
2323
length: 24
2424
assignment: ~
2525
nodes:
26-
- Text:
27-
content: "\n "
28-
span:
29-
start: 39
30-
length: 5
3126
- Variable:
3227
bits:
3328
- user
@@ -47,11 +42,6 @@ nodes:
4742
span:
4843
start: 47
4944
length: 31
50-
- Text:
51-
content: "\n "
52-
span:
53-
start: 81
54-
length: 5
5545
- Block:
5646
Block:
5747
tag:
@@ -69,11 +59,6 @@ nodes:
6959
length: 24
7060
assignment: ~
7161
nodes:
72-
- Text:
73-
content: "\n "
74-
span:
75-
start: 116
76-
length: 9
7762
- Block:
7863
Block:
7964
tag:
@@ -108,11 +93,6 @@ nodes:
10893
length: 5
10994
assignment: ~
11095
assignments: []
111-
- Text:
112-
content: "\n "
113-
span:
114-
start: 159
115-
length: 9
11696
- Variable:
11797
bits:
11898
- group
@@ -121,11 +101,6 @@ nodes:
121101
span:
122102
start: 171
123103
length: 10
124-
- Text:
125-
content: "\n "
126-
span:
127-
start: 184
128-
length: 9
129104
- Block:
130105
Block:
131106
tag:
@@ -161,11 +136,6 @@ nodes:
161136
length: 5
162137
assignment: ~
163138
assignments: []
164-
- Text:
165-
content: "\n "
166-
span:
167-
start: 231
168-
length: 9
169139
- Block:
170140
Block:
171141
tag:
@@ -200,11 +170,6 @@ nodes:
200170
length: 5
201171
assignment: ~
202172
assignments: []
203-
- Text:
204-
content: "\n "
205-
span:
206-
start: 273
207-
length: 5
208173
- Block:
209174
Tag:
210175
tag:
@@ -219,15 +184,10 @@ nodes:
219184
length: 5
220185
assignment: ~
221186
- Text:
222-
content: "\n (no groups)"
187+
content: " (no groups)"
223188
span:
224-
start: 289
189+
start: 290
225190
length: 20
226-
- Text:
227-
content: "\n "
228-
span:
229-
start: 309
230-
length: 5
231191
closing:
232192
Closing:
233193
tag:
@@ -242,11 +202,6 @@ nodes:
242202
length: 6
243203
assignment: ~
244204
assignments: []
245-
- Text:
246-
content: "\n"
247-
span:
248-
start: 326
249-
length: 1
250205
- Block:
251206
Tag:
252207
tag:
@@ -261,15 +216,10 @@ nodes:
261216
length: 4
262217
assignment: ~
263218
- Text:
264-
content: "\n Guest"
219+
content: " Guest"
265220
span:
266-
start: 337
221+
start: 338
267222
length: 10
268-
- Text:
269-
content: "\n"
270-
span:
271-
start: 347
272-
length: 1
273223
closing:
274224
Closing:
275225
tag:

0 commit comments

Comments
 (0)