3 files changed, 4 insertions, 4 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 6d5622b15..af21254e4 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -9,7 +9,7 @@ use languageserver_types::{
     WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents,
 };
 use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition};
-use ra_syntax::{TextUnit, text_utils::contains_offset_nonstrict};
+use ra_syntax::{TextUnit, text_utils::{contains_offset_nonstrict, intersect}};
 use rustc_hash::FxHashMap;
 use serde_json::to_value;
 
@@ -618,7 +618,7 @@ pub fn handle_code_action(
         .diagnostics(file_id)?
         .into_iter()
         .filter_map(|d| Some((d.range, d.fix?)))
-        .filter(|(range, _fix)| contains_offset_nonstrict(*range, range.start()))
+        .filter(|(diag_range, _fix)| intersect(*diag_range, range).is_some())
         .map(|(_range, fix)| fix);
 
     let mut res = Vec::new();
diff --git a/crates/ra_syntax/src/lexer/ptr.rs b/crates/ra_syntax/src/lexer/ptr.rs
index 7e4df51aa..0a473c991 100644
--- a/crates/ra_syntax/src/lexer/ptr.rs
+++ b/crates/ra_syntax/src/lexer/ptr.rs
@@ -28,7 +28,7 @@ impl<'s> Ptr<'s> {
     }
 
     /// Gets the nth character from the current.
-    /// For example, 0 will return the current token, 1 will return the next, etc.
+    /// For example, 0 will return the current character, 1 will return the next, etc.
     pub fn nth(&self, n: u32) -> Option<char> {
         self.chars().nth(n as usize)
     }
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs
index 3013f4e36..4ff783c50 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@ -17,7 +17,7 @@ pub type Result<T> = ::std::result::Result<T, failure::Error>;
 pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
 pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
 pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera";
-const TOOLCHAIN: &str = "beta-2018-11-24";
+const TOOLCHAIN: &str = "1.31.0";
 
 #[derive(Debug)]
 pub struct Test {