Merge pull request #604 from jonasbb/fix-599

Return CodeAction for any overlapping range, not just identical ranges (#599)

Author: nrc

Cargo.lock

@@ -13,7 +13,7 @@ build = "build.rs"
 cargo = { git = "https://github.com/rust-lang/cargo" }
 env_logger = "0.4"
 jsonrpc-core = "7.0.1"
-languageserver-types = "0.14"
+languageserver-types = "0.16"
 lazy_static = "0.2"
 log = "0.3"
 racer = "2.0.12"

Cargo.toml

@@ -641,7 +641,7 @@ impl CodeAction {
         if let Some(diagnostics) = ctx.previous_build_results.lock().unwrap().get(file_path) {
             let suggestions = diagnostics
                 .iter()
-                .filter(|&&(ref d, _)| d.range == params.range)
+                .filter(|&&(ref d, _)| d.range.overlaps(&params.range))
                 .flat_map(|&(_, ref ss)| ss.iter());
             for s in suggestions {
                 let span = Location {

src/actions/requests.rs

@@ -236,6 +236,20 @@ pub fn completion_item_from_racer_match(m: racer::Match) -> CompletionItem {
     item
 }
 
+/* ------  Extension methods for JSON-RPC protocol types ------ */
+
+/// Provide additional methods for the remote `Range` type
+pub trait RangeExt {
+    /// Do both Ranges overlap?
+    fn overlaps(&self, other: &Self) -> bool;
+}
+
+impl RangeExt for Range {
+    fn overlaps(&self, other: &Self) -> bool {
+        self.start <= other.end && other.start <= self.end
+    }
+}
+
 /* -----------------  JSON-RPC protocol types ----------------- */
 
 /// Supported initilization options that can be passed in the `initialize`