From b6c826506139a97447b6035116ae68b77c5e2228 Mon Sep 17 00:00:00 2001 From: Mikhail Katychev Date: Sat, 20 Jul 2024 16:34:12 -0500 Subject: [PATCH 1/2] handle unwrap --- src/server/handler/notification.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/handler/notification.rs b/src/server/handler/notification.rs index 681a5d9..30470bd 100644 --- a/src/server/handler/notification.rs +++ b/src/server/handler/notification.rs @@ -115,7 +115,7 @@ impl Server { .filter_map(|buf| buf.into_os_string().into_string().ok()) .collect::>() }) - .unwrap(); + .unwrap_or_default(); self.extend_libs(paths); From 82d29ce92d7cf2b68a3f4ac8e44ea07a104eb674 Mon Sep 17 00:00:00 2001 From: Mikhail Katychev Date: Sun, 21 Jul 2024 20:14:13 -0500 Subject: [PATCH 2/2] handle panic when no newline present --- src/server/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/utils.rs b/src/server/utils.rs index e0c0bfb..aea3c60 100644 --- a/src/server/utils.rs +++ b/src/server/utils.rs @@ -20,7 +20,7 @@ macro_rules! err_to_console { pub(crate) fn find_offset(text: &str, pos: Position) -> Option { let mut offset = 0; for _ in 0..pos.line { - offset += text[offset..].find('\n')? + 1; + offset += text[offset..].find('\n').unwrap_or_default() + 1; } let mut chars = text[offset..].chars();