Inline a few variables, remove explicit returns

This commit is contained in:
Dániel Buga 2022-09-11 19:26:20 +02:00
parent f195f25eed
commit 19e93fe7e6
1 changed files with 7 additions and 13 deletions

View File

@ -254,8 +254,6 @@ fn get_document_content_changes(
// TODO: Handle more trivial cases like typing when there's a selection or transpose // TODO: Handle more trivial cases like typing when there's a selection or transpose
if let Some(node) = delta.as_simple_insert() { if let Some(node) = delta.as_simple_insert() {
let text = String::from(node);
let (start, end) = interval.start_end(); let (start, end) = interval.start_end();
let start = if let Some(start) = buffer.offset_to_position(start) { let start = if let Some(start) = buffer.offset_to_position(start) {
start start
@ -271,13 +269,11 @@ fn get_document_content_changes(
return None; return None;
}; };
let text_document_content_change_event = TextDocumentContentChangeEvent { Some(TextDocumentContentChangeEvent {
range: Some(Range { start, end }), range: Some(Range { start, end }),
range_length: None, range_length: None,
text, text: String::from(node),
}; })
return Some(text_document_content_change_event);
} }
// Or a simple delete // Or a simple delete
else if delta.is_simple_delete() { else if delta.is_simple_delete() {
@ -295,19 +291,17 @@ fn get_document_content_changes(
return None; return None;
}; };
let text_document_content_change_event = TextDocumentContentChangeEvent { Some(TextDocumentContentChangeEvent {
range: Some(Range { range: Some(Range {
start, start,
end: end_position, end: end_position,
}), }),
range_length: None, range_length: None,
text: String::new(), text: String::new(),
}; })
} else {
return Some(text_document_content_change_event);
}
None None
}
} }
/// Returns the modification timestamp for the file at a given path, /// Returns the modification timestamp for the file at a given path,