Skip to content

Commit 1c526f6

Browse files
committed
Fix folding range issue
In `ark:namespace:base`
1 parent 4d6666a commit 1c526f6

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

crates/ark/src/lsp/folding_range.rs

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,28 +145,20 @@ fn bracket_range(
145145
white_space_count: usize,
146146
) -> FoldingRange {
147147
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);
149149

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 {
154152
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+
}
163155
}
164156

165157
FoldingRange {
166158
start_line: start_line as u32,
167159
start_character: Some(start_char as u32),
168160
end_line,
169-
end_character: end_char,
161+
end_character,
170162
kind: Some(FoldingRangeKind::Region),
171163
collapsed_text: None,
172164
}
@@ -215,7 +207,10 @@ fn get_line_text(
215207

216208
fn count_leading_whitespaces(document: &Document, line_num: usize) -> usize {
217209
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()
219214
}
220215

221216
pub static RE_COMMENT_SECTION: LazyLock<Regex> =

0 commit comments

Comments
 (0)