Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer

1 files changed, 14 insertions, 1 deletions

diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs
index e5d1779fd..7f1b9150f 100644
--- a/crates/ra_ide/src/typing.rs
+++ b/crates/ra_ide/src/typing.rs
@@ -42,7 +42,7 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Sour
 
     let prefix = comment.prefix();
     let comment_range = comment.syntax().text_range();
-    if position.offset < comment_range.start() + TextUnit::of_str(prefix) + TextUnit::from(1) {
+    if position.offset < comment_range.start() + TextUnit::of_str(prefix) {
         return None;
     }
 
@@ -267,6 +267,19 @@ fn main() {
 }
 ",
         );
+        do_check(
+            r"
+///<|> Some docs
+fn foo() {
+}
+",
+            r"
+///
+/// <|> Some docs
+fn foo() {
+}
+",
+        );
         do_check_noop(
             r"
 fn main() {