@@ -950,19 +950,19 @@ impl<'src> Classifier<'src> {
950
950
let file_span = self . file_span ;
951
951
let no_highlight =
952
952
|| ( new_span ( before, text, file_span) , Highlight :: Token { text, class : None } ) ;
953
- let mut whitespace = || {
953
+ let mut whitespace = |class | {
954
954
let mut start = 0u32 ;
955
955
for part in text. split ( '\n' ) . intersperse ( "\n " ) . filter ( |s| !s. is_empty ( ) ) {
956
956
sink (
957
957
new_span ( before + start, part, file_span) ,
958
- Highlight :: Token { text : part, class : None } ,
958
+ Highlight :: Token { text : part, class } ,
959
959
) ;
960
960
start += part. len ( ) as u32 ;
961
961
}
962
962
} ;
963
963
let class = match token {
964
964
TokenKind :: Whitespace => {
965
- whitespace ( ) ;
965
+ whitespace ( None ) ;
966
966
return ;
967
967
}
968
968
TokenKind :: LineComment { doc_style } | TokenKind :: BlockComment { doc_style, .. } => {
@@ -986,7 +986,7 @@ impl<'src> Classifier<'src> {
986
986
// a logical and or a multiplication operator: `&&` or `* `.
987
987
TokenKind :: Star => match self . tokens . peek ( ) {
988
988
Some ( ( TokenKind :: Whitespace , _) ) => {
989
- whitespace ( ) ;
989
+ whitespace ( None ) ;
990
990
return ;
991
991
}
992
992
Some ( ( TokenKind :: Ident , "mut" ) ) => {
@@ -1019,7 +1019,7 @@ impl<'src> Classifier<'src> {
1019
1019
return ;
1020
1020
}
1021
1021
Some ( ( TokenKind :: Whitespace , _) ) => {
1022
- whitespace ( ) ;
1022
+ whitespace ( None ) ;
1023
1023
return ;
1024
1024
}
1025
1025
Some ( ( TokenKind :: Ident , "mut" ) ) => {
@@ -1206,14 +1206,7 @@ impl<'src> Classifier<'src> {
1206
1206
} ;
1207
1207
// Anything that didn't return above is the simple case where we the
1208
1208
// class just spans a single token, so we can use the `string` method.
1209
- let mut start = 0u32 ;
1210
- for part in text. split ( '\n' ) . intersperse ( "\n " ) . filter ( |s| !s. is_empty ( ) ) {
1211
- sink (
1212
- new_span ( before + start, part, file_span) ,
1213
- Highlight :: Token { text : part, class : Some ( class) } ,
1214
- ) ;
1215
- start += part. len ( ) as u32 ;
1216
- }
1209
+ whitespace ( Some ( class) ) ;
1217
1210
}
1218
1211
1219
1212
fn peek ( & mut self ) -> Option < TokenKind > {
0 commit comments