Skip to content

Commit fdf1ebb

Browse files
add tag span
1 parent 43e6ea8 commit fdf1ebb

10 files changed

+20
-18
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,15 @@ impl Parser {
9393
.map(String::from)
9494
.collect();
9595
let tag_name = bits.first().ok_or(ParserError::EmptyTag)?.clone();
96+
9697
let span = Span::from(token);
98+
let tag_span = Span::new(*span.start(), tag_name.len() as u32);
9799

98100
let tag = Tag {
99101
name: tag_name.clone(),
100102
bits: bits.clone(),
101103
span,
102-
tag_span: span,
104+
tag_span,
103105
assignment: None,
104106
};
105107

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ nodes:
1717
length: 8
1818
tag_span:
1919
start: 3
20-
length: 8
20+
length: 2
2121
assignment: ~
2222
nodes:
2323
- Text:
@@ -39,7 +39,7 @@ nodes:
3939
length: 10
4040
tag_span:
4141
start: 25
42-
length: 10
42+
length: 4
4343
assignment: ~
4444
nodes:
4545
- Text:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ nodes:
1717
length: 17
1818
tag_span:
1919
start: 3
20-
length: 17
20+
length: 3
2121
assignment: ~
2222
nodes:
2323
- Variable:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nodes:
1515
length: 24
1616
tag_span:
1717
start: 3
18-
length: 24
18+
length: 2
1919
assignment: ~
2020
nodes:
2121
- Text:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ nodes:
2020
length: 24
2121
tag_span:
2222
start: 12
23-
length: 24
23+
length: 2
2424
assignment: ~
2525
nodes:
2626
- Variable:
@@ -56,7 +56,7 @@ nodes:
5656
length: 24
5757
tag_span:
5858
start: 89
59-
length: 24
59+
length: 3
6060
assignment: ~
6161
nodes:
6262
- Block:
@@ -71,7 +71,7 @@ nodes:
7171
length: 16
7272
tag_span:
7373
start: 128
74-
length: 16
74+
length: 2
7575
assignment: ~
7676
nodes:
7777
- Text:
@@ -113,7 +113,7 @@ nodes:
113113
length: 19
114114
tag_span:
115115
start: 196
116-
length: 19
116+
length: 2
117117
assignment: ~
118118
nodes:
119119
- Text:
@@ -146,7 +146,7 @@ nodes:
146146
length: 15
147147
tag_span:
148148
start: 243
149-
length: 15
149+
length: 2
150150
assignment: ~
151151
nodes:
152152
- Text:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ nodes:
1717
length: 17
1818
tag_span:
1919
start: 3
20-
length: 17
20+
length: 3
2121
assignment: ~
2222
nodes:
2323
- Block:
@@ -32,7 +32,7 @@ nodes:
3232
length: 14
3333
tag_span:
3434
start: 26
35-
length: 14
35+
length: 2
3636
assignment: ~
3737
nodes:
3838
- Variable:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ nodes:
2525
length: 24
2626
tag_span:
2727
start: 51
28-
length: 24
28+
length: 2
2929
assignment: ~
3030
nodes:
3131
- Comment:
@@ -75,7 +75,7 @@ nodes:
7575
length: 17
7676
tag_span:
7777
start: 255
78-
length: 17
78+
length: 3
7979
assignment: ~
8080
nodes:
8181
- Text:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ nodes:
1717
length: 17
1818
tag_span:
1919
start: 3
20-
length: 17
20+
length: 3
2121
assignment: ~
2222
nodes:
2323
- Variable:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nodes:
1515
length: 24
1616
tag_span:
1717
start: 3
18-
length: 24
18+
length: 2
1919
assignment: ~
2020
nodes:
2121
- Text:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ nodes:
105105
length: 24
106106
tag_span:
107107
start: 466
108-
length: 24
108+
length: 2
109109
assignment: ~
110110
nodes:
111111
- Comment:
@@ -154,7 +154,7 @@ nodes:
154154
length: 16
155155
tag_span:
156156
start: 624
157-
length: 16
157+
length: 2
158158
assignment: ~
159159
nodes:
160160
- Text:

0 commit comments

Comments
 (0)