josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-09-14 06:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

yep

Browse source
This commit is contained in:
Josh Thomas 2025-01-06 12:06:35 -06:00
parent 86bf88061b
commit 8fdf5ca038
14 changed files with 23 additions and 726 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/djls-template-ast/src/parser.rs
View file

@ -281,20 +281,11 @@ impl Parser {
let start_token = self.peek_previous()?; let start_token = self.peek_previous()?;
let start_pos = start_token.start().unwrap_or(0); let start_pos = start_token.start().unwrap_or(0);
match start_token.token_type() { if start_token.token_type() == &TokenType::Newline {
TokenType::Newline => return self.next_node(), return self.next_node();
TokenType::Whitespace(_)
if self
.peek_at(-2)
.map_or(false, |t| matches!(t.token_type(), TokenType::Newline)) =>
{
return self.next_node()
}
_ => {}
} }
let mut text = start_token.token_type().to_string(); let mut text = start_token.token_type().to_string();
let mut total_length: u32 = u32::try_from(text.len()).unwrap();
while let Ok(token) = self.peek() { while let Ok(token) = self.peek() {
match token.token_type() { match token.token_type() {
@ -303,39 +294,25 @@ impl Parser {
| TokenType::Comment(_, _, _) | TokenType::Comment(_, _, _)
| TokenType::Newline | TokenType::Newline
| TokenType::Eof => break, | TokenType::Eof => break,
TokenType::Whitespace(_) => {
// Check if next token is a newline
if let Ok(next) = self.peek_at(1) {
if matches!(next.token_type(), TokenType::Newline) {
self.consume()?;
break;
}
}
// Not before newline, treat as normal text
let token_text = token.token_type().to_string();
text.push_str(&token_text);
total_length += u32::try_from(token_text.len()).unwrap();
self.consume()?;
}
_ => { _ => {
let token_text = token.token_type().to_string(); let token_text = token.token_type().to_string();
text.push_str(&token_text); text.push_str(&token_text);
total_length += u32::try_from(token_text.len()).unwrap();
self.consume()?; self.consume()?;
} }
} }
} }
if text.trim().is_empty() { let content = match text.trim() {
self.next_node() "" => return self.next_node(),
} else { trimmed => trimmed.to_string(),
let trimmed = text.trim(); };
Ok(Node::Text { let offset = u32::try_from(text.find(content.as_str()).unwrap_or(0)).unwrap();
content: trimmed.to_string(), let length = u32::try_from(content.len()).unwrap();
span: Span::new(start_pos + u32::try_from(text.find(trimmed).unwrap_or(0)).unwrap(),
u32::try_from(trimmed.len()).unwrap()), Ok(Node::Text {
}) content,
} span: Span::new(start_pos + offset, length),
})
} }
fn peek(&self) -> Result<Token, ParserError> { fn peek(&self) -> Result<Token, ParserError> {

8
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap
View file

@ -4,10 +4,10 @@ expression: ast
--- ---
nodes: nodes:
- Text: - Text:
content: "Welcome, " content: "Welcome,"
span: span:
start: 0 start: 0
length: 9 length: 8
- Block: - Block:
Block: Block:
tag: tag:
@ -118,10 +118,10 @@ nodes:
assignment: ~ assignment: ~
nodes: nodes:
- Text: - Text:
content: ", " content: ","
span: span:
start: 218 start: 218
length: 2 length: 1
closing: closing:
Closing: Closing:
tag: tag:

259
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap.new
View file

@ -1,259 +0,0 @@
---
source: crates/djls-template-ast/src/parser.rs
assertion_line: 550
expression: ast
snapshot_kind: text
---
nodes:
- Text:
content: "Welcome,"
span:
start: 0
length: 8
- Block:
Block:
tag:
name: if
bits:
- if
- user.is_authenticated
span:
start: 9
length: 24
tag_span:
start: 9
length: 24
assignment: ~
nodes:
- Variable:
bits:
- user
- name
filters:
- name: title
args: []
span:
start: 48
length: 31
- name: default
args:
- "'Guest'"
span:
start: 48
length: 31
span:
start: 47
length: 31
- Block:
Block:
tag:
name: for
bits:
- for
- group
- in
- user.groups
span:
start: 86
length: 24
tag_span:
start: 86
length: 24
assignment: ~
nodes:
- Block:
Block:
tag:
name: if
bits:
- if
- forloop.first
span:
start: 125
length: 16
tag_span:
start: 125
length: 16
assignment: ~
nodes:
- Text:
content: (
span:
start: 147
length: 1
closing:
Closing:
tag:
name: endif
bits:
- endif
span:
start: 148
length: 5
tag_span:
start: 148
length: 5
assignment: ~
assignments: ~
- Variable:
bits:
- group
- name
filters: []
span:
start: 171
length: 10
- Block:
Block:
tag:
name: if
bits:
- if
- not
- forloop.last
span:
start: 193
length: 19
tag_span:
start: 193
length: 19
assignment: ~
nodes:
- Text:
content: ","
span:
start: 218
length: 1
closing:
Closing:
tag:
name: endif
bits:
- endif
span:
start: 220
length: 5
tag_span:
start: 220
length: 5
assignment: ~
assignments: ~
- Block:
Block:
tag:
name: if
bits:
- if
- forloop.last
span:
start: 240
length: 15
tag_span:
start: 240
length: 15
assignment: ~
nodes:
- Text:
content: )
span:
start: 261
length: 1
closing:
Closing:
tag:
name: endif
bits:
- endif
span:
start: 262
length: 5
tag_span:
start: 262
length: 5
assignment: ~
assignments: ~
- Block:
Branch:
tag:
name: empty
bits:
- empty
span:
start: 278
length: 5
tag_span:
start: 278
length: 5
assignment: ~
nodes:
- Text:
content: (no groups)
span:
start: 298
length: 11
closing:
Closing:
tag:
name: endfor
bits:
- endfor
span:
start: 314
length: 6
tag_span:
start: 314
length: 6
assignment: ~
assignments: ~
- Block:
Branch:
tag:
name: else
bits:
- else
span:
start: 327
length: 4
tag_span:
start: 327
length: 4
assignment: ~
nodes:
- Text:
content: Guest
span:
start: 342
length: 5
closing:
Closing:
tag:
name: endif
bits:
- endif
span:
start: 348
length: 5
tag_span:
start: 348
length: 5
assignment: ~
assignments: ~
- Text:
content: "!"
span:
start: 359
length: 1
line_offsets:
- 0
- 40
- 82
- 117
- 160
- 185
- 232
- 274
- 290
- 310
- 327
- 338
- 348

4
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap
View file

@ -34,10 +34,10 @@ nodes:
start: 87 start: 87
length: 43 length: 43
- Text: - Text:
content: "<p>Welcome " content: "<p>Welcome"
span: span:
start: 139 start: 139
length: 11 length: 10
- Variable: - Variable:
bits: bits:
- user - user

138
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap.new
View file

@ -1,138 +0,0 @@
---
source: crates/djls-template-ast/src/parser.rs
assertion_line: 728
expression: ast
snapshot_kind: text
---
nodes:
- Text:
content: "<div class=\"container\">"
span:
start: 0
length: 23
- Text:
content: "<h1>Header</h1>"
span:
start: 28
length: 15
- Block:
Block:
tag:
name: if
bits:
- if
- user.is_authenticated
span:
start: 48
length: 24
tag_span:
start: 48
length: 24
assignment: ~
nodes:
- Comment:
content: This if is unclosed which does matter
span:
start: 87
length: 43
- Text:
content: "<p>Welcome"
span:
start: 139
length: 10
- Variable:
bits:
- user
- name
filters: []
span:
start: 153
length: 9
- Text:
content: "</p>"
span:
start: 165
length: 4
- Text:
content: "<div>"
span:
start: 178
length: 5
- Comment:
content: "This div is unclosed which doesn't matter"
span:
start: 196
length: 47
- Block:
Block:
tag:
name: for
bits:
- for
- item
- in
- items
span:
start: 252
length: 17
tag_span:
start: 252
length: 17
assignment: ~
nodes:
- Text:
content: "<span>"
span:
start: 288
length: 6
- Variable:
bits:
- item
filters: []
span:
start: 297
length: 4
- Text:
content: "</span>"
span:
start: 304
length: 7
closing:
Closing:
tag:
name: endfor
bits:
- endfor
span:
start: 320
length: 6
tag_span:
start: 320
length: 6
assignment: ~
assignments: ~
- Text:
content: "<footer>Page Footer</footer>"
span:
start: 337
length: 28
- Text:
content: "</div>"
span:
start: 366
length: 6
closing: ~
assignments: ~
line_offsets:
- 0
- 24
- 44
- 79
- 131
- 170
- 184
- 244
- 276
- 312
- 333
- 366

4
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap
View file

@ -4,9 +4,9 @@ expression: ast
--- ---
nodes: nodes:
- Text: - Text:
content: "<style>body { color: blue; " content: "<style>body { color: blue;"
span: span:
start: 0 start: 0
length: 27 length: 26
line_offsets: line_offsets:
- 0 - 0

14
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap.new
View file

@ -1,14 +0,0 @@
---
source: crates/djls-template-ast/src/parser.rs
assertion_line: 707
expression: ast
snapshot_kind: text
---
nodes:
- Text:
content: "<style>body { color: blue;"
span:
start: 0
length: 26
line_offsets:
- 0

4
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap
View file

@ -114,10 +114,10 @@ nodes:
start: 510 start: 510
length: 21 length: 21
- Text: - Text:
content: "<h1>Welcome, " content: "<h1>Welcome,"
span: span:
start: 548 start: 548
length: 13 length: 12
- Variable: - Variable:
bits: bits:
- user - user

259
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap.new
View file

@ -1,259 +0,0 @@
---
source: crates/djls-template-ast/src/parser.rs
assertion_line: 774
expression: ast
snapshot_kind: text
---
nodes:
- Text:
content: "<!DOCTYPE html>"
span:
start: 0
length: 15
- Text:
content: "<html>"
span:
start: 16
length: 6
- Text:
content: "<head>"
span:
start: 27
length: 6
- Text:
content: "<style type=\"text/css\">"
span:
start: 42
length: 23
- Text:
content: /* Style header */
span:
start: 78
length: 18
- Text:
content: ".header { color: blue; }"
span:
start: 109
length: 24
- Text:
content: "</style>"
span:
start: 142
length: 8
- Text:
content: "<script type=\"text/javascript\">"
span:
start: 159
length: 31
- Text:
content: // Init app
span:
start: 203
length: 11
- Text:
content: "const app = {"
span:
start: 227
length: 13
- Text:
content: /* Config */
span:
start: 257
length: 12
- Text:
content: "debug: true"
span:
start: 286
length: 11
- Text:
content: "};"
span:
start: 310
length: 2
- Text:
content: "</script>"
span:
start: 321
length: 9
- Text:
content: "</head>"
span:
start: 335
length: 7
- Text:
content: "<body>"
span:
start: 347
length: 6
- Text:
content: "<!-- Header section -->"
span:
start: 362
length: 23
- Text:
content: "<div class=\"header\" id=\"main\" data-value=\"123\" disabled>"
span:
start: 394
length: 56
- Block:
Block:
tag:
name: if
bits:
- if
- user.is_authenticated
span:
start: 463
length: 24
tag_span:
start: 463
length: 24
assignment: ~
nodes:
- Comment:
content: Welcome message
span:
start: 510
length: 21
- Text:
content: "<h1>Welcome,"
span:
start: 548
length: 12
- Variable:
bits:
- user
- name
filters:
- name: title
args: []
span:
start: 565
length: 31
- name: default
args:
- "'Guest'"
span:
start: 565
length: 31
span:
start: 564
length: 31
- Text:
content: "!</h1>"
span:
start: 598
length: 6
- Block:
Block:
tag:
name: if
bits:
- if
- user.is_staff
span:
start: 621
length: 16
tag_span:
start: 621
length: 16
assignment: ~
nodes:
- Text:
content: "<span>Admin</span>"
span:
start: 664
length: 18
- Block:
Branch:
tag:
name: else
bits:
- else
span:
start: 699
length: 4
tag_span:
start: 699
length: 4
assignment: ~
nodes:
- Text:
content: "<span>User</span>"
span:
start: 730
length: 17
closing:
Closing:
tag:
name: endif
bits:
- endif
span:
start: 764
length: 5
tag_span:
start: 764
length: 5
assignment: ~
assignments: ~
closing:
Closing:
tag:
name: endif
bits:
- endif
span:
start: 788
length: 5
tag_span:
start: 788
length: 5
assignment: ~
assignments: ~
- Text:
content: "</div>"
span:
start: 808
length: 6
- Text:
content: "</body>"
span:
start: 819
length: 7
- Text:
content: "</html>"
span:
start: 827
length: 7
line_offsets:
- 0
- 16
- 23
- 34
- 66
- 97
- 134
- 151
- 191
- 215
- 241
- 270
- 298
- 313
- 331
- 343
- 354
- 386
- 451
- 494
- 532
- 605
- 644
- 683
- 710
- 748
- 776
- 800
- 815
- 827

2
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_with_leading_whitespace.snap.new → crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_with_leading_whitespace.snap
View file

@ -1,8 +1,6 @@
--- ---
source: crates/djls-template-ast/src/parser.rs source: crates/djls-template-ast/src/parser.rs
assertion_line: 472
expression: ast expression: ast
snapshot_kind: text
--- ---
nodes: nodes:
- Text: - Text:

2
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_leading_whitespace.snap.new → crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_leading_whitespace.snap
View file

@ -1,8 +1,6 @@
--- ---
source: crates/djls-template-ast/src/parser.rs source: crates/djls-template-ast/src/parser.rs
assertion_line: 617
expression: ast expression: ast
snapshot_kind: text
--- ---
nodes: nodes:
- Text: - Text:

2
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_leading_whitespace_newline.snap.new → crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_leading_whitespace_newline.snap
View file

@ -1,8 +1,6 @@
--- ---
source: crates/djls-template-ast/src/parser.rs source: crates/djls-template-ast/src/parser.rs
assertion_line: 627
expression: ast expression: ast
snapshot_kind: text
--- ---
nodes: nodes:
- Text: - Text:

2
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_trailing_whitespace.snap.new → crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_trailing_whitespace.snap
View file

@ -1,8 +1,6 @@
--- ---
source: crates/djls-template-ast/src/parser.rs source: crates/djls-template-ast/src/parser.rs
assertion_line: 637
expression: ast expression: ast
snapshot_kind: text
--- ---
nodes: nodes:
- Text: - Text:

2
crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_trailing_whitespace_newline.snap.new → crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__whitespace__parse_with_trailing_whitespace_newline.snap
View file

@ -1,8 +1,6 @@
--- ---
source: crates/djls-template-ast/src/parser.rs source: crates/djls-template-ast/src/parser.rs
assertion_line: 647
expression: ast expression: ast
snapshot_kind: text
--- ---
nodes: nodes:
- Text: - Text: