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

3 files changed, 54 insertions, 7 deletions

diff --git a/crates/ra_ide_api/src/typing.rs b/crates/ra_ide_api/src/typing.rs
index d51132f73..21e5be9b3 100644
--- a/crates/ra_ide_api/src/typing.rs
+++ b/crates/ra_ide_api/src/typing.rs
@@ -40,9 +40,13 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Sour
     }
 
     let prefix = comment.prefix();
-    if position.offset
-        < comment.syntax().text_range().start() + TextUnit::of_str(prefix) + TextUnit::from(1)
-    {
+    let comment_range = comment.syntax().text_range();
+    if position.offset < comment_range.start() + TextUnit::of_str(prefix) + TextUnit::from(1) {
+        return None;
+    }
+
+    // Continuing non-doc line comments (like this one :) ) is annoying
+    if prefix == "//" && comment_range.end() == position.offset {
         return None;
     }
 
@@ -247,6 +251,30 @@ impl S {
 }
 ",
         );
+        do_check(
+            r"
+fn main() {
+    // Fix<|> me
+    let x = 1 + 1;
+}
+",
+            r"
+fn main() {
+    // Fix
+    // <|> me
+    let x = 1 + 1;
+}
+",
+        );
+        do_check_noop(
+            r"
+fn main() {
+    // Fix me<|>
+    let x = 1 + 1;
+}
+",
+        );
+
         do_check_noop(r"<|>//! docz");
     }
 
diff --git a/crates/ra_lsp_server/src/lib.rs b/crates/ra_lsp_server/src/lib.rs
index 0e5dbbbd5..9c36402b0 100644
--- a/crates/ra_lsp_server/src/lib.rs
+++ b/crates/ra_lsp_server/src/lib.rs
@@ -1,6 +1,26 @@
-//! FIXME: write short doc here
-
+//! Implementation of the LSP for rust-analyzer.
+//!
+//! This crate takes Rust-specific analysis results from ra_ide_api and
+//! translates into LSP types.
+//!
+//! It also is the root of all state. `world` module defines the bulk of the
+//! state, and `main_loop` module defines the rules for modifying it.
 #![recursion_limit = "512"]
+
+#[allow(unused)]
+macro_rules! println {
+    ($($tt:tt)*) => {
+        compile_error!("stdout is locked, use eprintln")
+    };
+}
+
+#[allow(unused)]
+macro_rules! print {
+    ($($tt:tt)*) => {
+        compile_error!("stdout is locked, use eprint")
+    };
+}
+
 mod caps;
 mod cargo_target_spec;
 mod conv;
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index 7d9a1d054..e13c8ca14 100644
--- a/crates/ra_lsp_server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -1,8 +1,7 @@
-//! FIXME: write short doc here
+//! `ra_lsp_server` binary
 
 use flexi_logger::{Duplicate, Logger};
 use lsp_server::Connection;
-
 use ra_lsp_server::{show_message, Result, ServerConfig};
 use ra_prof;