diff options
Diffstat (limited to 'src/parser/event.rs')
-rw-r--r-- | src/parser/event.rs | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/parser/event.rs b/src/parser/event.rs index fd6bdc086..64d751d63 100644 --- a/src/parser/event.rs +++ b/src/parser/event.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use {File, FileBuilder, Sink, SyntaxKind, Token}; | 1 | use {File, FileBuilder, Sink, SyntaxKind, Token, TextUnit}; |
2 | use syntax_kinds::TOMBSTONE; | 2 | use syntax_kinds::TOMBSTONE; |
3 | use super::is_insignificant; | 3 | use super::is_insignificant; |
4 | 4 | ||
@@ -120,18 +120,25 @@ pub(super) fn to_file(text: String, tokens: &[Token], events: Vec<Event>) -> Fil | |||
120 | builder.finish_internal() | 120 | builder.finish_internal() |
121 | } | 121 | } |
122 | &Event::Token { | 122 | &Event::Token { |
123 | kind: _, | 123 | kind, |
124 | mut n_raw_tokens, | 124 | mut n_raw_tokens, |
125 | } => loop { | 125 | } => { |
126 | let token = tokens[idx]; | 126 | // FIXME: currently, we attach whitespace to some random node |
127 | if !is_insignificant(token.kind) { | 127 | // this should be done in a sensible manner instead |
128 | n_raw_tokens -= 1; | 128 | loop { |
129 | let token = tokens[idx]; | ||
130 | if !is_insignificant(token.kind) { | ||
131 | break; | ||
132 | } | ||
133 | builder.leaf(token.kind, token.len); | ||
134 | idx += 1 | ||
129 | } | 135 | } |
130 | idx += 1; | 136 | let mut len = TextUnit::new(0); |
131 | builder.leaf(token.kind, token.len); | 137 | for _ in 0..n_raw_tokens { |
132 | if n_raw_tokens == 0 { | 138 | len += tokens[idx].len; |
133 | break; | 139 | idx += 1; |
134 | } | 140 | } |
141 | builder.leaf(kind, len); | ||
135 | }, | 142 | }, |
136 | &Event::Error { ref message } => builder.error().message(message.clone()).emit(), | 143 | &Event::Error { ref message } => builder.error().message(message.clone()).emit(), |
137 | } | 144 | } |