updates

joshuadavidthomas · joshuadavidthomas · commit fab360bb6070 · 2025-01-05T00:01:29.000-06:00
diff --git a/crates/djls-template-ast/src/parser.rs b/crates/djls-template-ast/src/parser.rs
@@ -20,11 +20,11 @@ impl Parser {
 
         // First pass: collect line offsets
         for token in self.tokens.tokens() {
-            if token.line() > last_line {
+            if *token.line() > last_line {
                 if let Some(start) = token.start() {
                     line_offsets.add_line(*start as u32);
                 }
-                last_line = token.line();
+                last_line = *token.line();
             }
         }
 
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap
@@ -13,5 +13,7 @@ nodes:
       span:
         start: 21
         length: 18
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap
@@ -69,5 +69,7 @@ nodes:
       tag_span:
         start: 0
         length: 8
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap
@@ -52,5 +52,7 @@ nodes:
       tag_span:
         start: 0
         length: 17
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap
@@ -32,5 +32,7 @@ nodes:
       tag_span:
         start: 0
         length: 24
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap
@@ -16,5 +16,7 @@ nodes:
       span:
         start: 0
         length: 15
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap
@@ -26,5 +26,7 @@ nodes:
       span:
         start: 0
         length: 35
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap
@@ -250,5 +250,19 @@ nodes:
       span:
         start: 359
         length: 1
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
+  - 39
+  - 81
+  - 116
+  - 159
+  - 184
+  - 231
+  - 273
+  - 289
+  - 309
+  - 326
+  - 337
+  - 347
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap
@@ -61,5 +61,7 @@ nodes:
       tag_span:
         start: 0
         length: 17
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap
@@ -107,6 +107,19 @@ nodes:
       tag_span:
         start: 48
         length: 24
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
+  - 23
+  - 43
+  - 78
+  - 130
+  - 169
+  - 183
+  - 243
+  - 275
+  - 311
+  - 332
+  - 365
 errors:
   - UnclosedTag: if
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap
@@ -26,6 +26,8 @@ nodes:
       tag_span:
         start: 0
         length: 17
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors:
   - UnclosedTag: for
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap
@@ -21,6 +21,8 @@ nodes:
       tag_span:
         start: 0
         length: 24
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors:
   - UnclosedTag: if
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap
@@ -8,5 +8,7 @@ nodes:
       span:
         start: 0
         length: 5
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap
@@ -8,5 +8,7 @@ nodes:
       span:
         start: 0
         length: 28
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap
@@ -8,5 +8,7 @@ nodes:
       span:
         start: 0
         length: 27
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap
@@ -126,5 +126,36 @@ nodes:
       span:
         start: 799
         length: 35
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
+  - 15
+  - 22
+  - 33
+  - 65
+  - 96
+  - 133
+  - 150
+  - 190
+  - 214
+  - 240
+  - 269
+  - 297
+  - 312
+  - 330
+  - 342
+  - 353
+  - 385
+  - 450
+  - 493
+  - 531
+  - 604
+  - 643
+  - 682
+  - 709
+  - 747
+  - 775
+  - 799
+  - 814
+  - 826
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap
@@ -8,5 +8,7 @@ nodes:
       span:
         start: 0
         length: 15
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap
@@ -8,5 +8,7 @@ nodes:
       span:
         start: 0
         length: 34
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap
@@ -8,5 +8,7 @@ nodes:
       span:
         start: 0
         length: 21
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap
@@ -8,5 +8,13 @@ nodes:
       span:
         start: 0
         length: 142
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
+  - 31
+  - 58
+  - 75
+  - 93
+  - 112
+  - 132
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap
@@ -8,5 +8,12 @@ nodes:
       span:
         start: 0
         length: 97
-line_offsets: []
+line_offsets:
+  - 0
+  - 0
+  - 23
+  - 47
+  - 61
+  - 82
+  - 88
 errors: []

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ impl Parser {`
`20`	`20`
`21`	`21`	`// First pass: collect line offsets`
`22`	`22`	`for token in self.tokens.tokens() {`
`23`		`- if token.line() > last_line {`
	`23`	`+ if *token.line() > last_line {`
`24`	`24`	`if let Some(start) = token.start() {`
`25`	`25`	`line_offsets.add_line(*start as u32);`
`26`	`26`	`}`
`27`		`- last_line = token.line();`
	`27`	`+ last_line = *token.line();`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`