Merge #3229

3229: Fix a crash with non-ascii whitespace in doc-comments r=matklad a=sinkuu

2nd commit is a random drive-by cleanup.

Co-authored-by: Shotaro Yamada <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs
index f99984fe0..f8cf1e3eb 100644
--- a/crates/ra_syntax/src/ast/traits.rs
+++ b/crates/ra_syntax/src/ast/traits.rs
@@ -126,8 +126,8 @@ pub trait DocCommentsOwner: AstNode {
 
                 // Determine if the prefix or prefix + 1 char is stripped
                 let pos =
-                    if line.chars().nth(prefix_len).map(|c| c.is_whitespace()).unwrap_or(false) {
-                        prefix_len + 1
+                    if let Some(ws) = line.chars().nth(prefix_len).filter(|c| c.is_whitespace()) {
+                        prefix_len + ws.len_utf8()
                     } else {
                         prefix_len
                     };