File tree Expand file tree Collapse file tree 1 file changed +10
-15
lines changed Expand file tree Collapse file tree 1 file changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -145,28 +145,20 @@ fn bracket_range(
145
145
white_space_count : usize ,
146
146
) -> FoldingRange {
147
147
let mut end_line: u32 = end_line as u32 ;
148
- let mut end_char : Option < u32 > = Some ( end_char as u32 ) ;
148
+ let mut end_character = Some ( end_char as u32 ) ;
149
149
150
- let adjusted_end_char = end_char. and_then ( |val| val. checked_sub ( white_space_count as u32 ) ) ;
151
-
152
- match adjusted_end_char {
153
- Some ( 0 ) => {
150
+ if let Some ( val) = end_char. checked_sub ( white_space_count) {
151
+ if val == 0 {
154
152
end_line -= 1 ;
155
- end_char = None ;
156
- } ,
157
- Some ( _) => { } ,
158
- None => {
159
- tracing:: error!(
160
- "Folding Range (bracket_range): adjusted_end_char should not be None here"
161
- ) ;
162
- } ,
153
+ end_character = None ;
154
+ }
163
155
}
164
156
165
157
FoldingRange {
166
158
start_line : start_line as u32 ,
167
159
start_character : Some ( start_char as u32 ) ,
168
160
end_line,
169
- end_character : end_char ,
161
+ end_character,
170
162
kind : Some ( FoldingRangeKind :: Region ) ,
171
163
collapsed_text : None ,
172
164
}
@@ -215,7 +207,10 @@ fn get_line_text(
215
207
216
208
fn count_leading_whitespaces ( document : & Document , line_num : usize ) -> usize {
217
209
let line_text = get_line_text ( document, line_num, None , None ) ;
218
- line_text. chars ( ) . take_while ( |c| c. is_whitespace ( ) ) . count ( )
210
+ line_text
211
+ . chars ( )
212
+ . take_while ( |c| * c == ' ' || * c == '\t' )
213
+ . count ( )
219
214
}
220
215
221
216
pub static RE_COMMENT_SECTION : LazyLock < Regex > =
You can’t perform that action at this time.
0 commit comments