4 files changed, 16 insertions, 7 deletions

diff --git a/.travis.yml b/.travis.yml
index f8130a595..acf1af028 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
       node_js: node
       before_script: false
       script:
-        - cd editors/code && npm ci && npm run travis; cd ../..
+        - cd editors/code && npm ci && npm run travis
 
   allow_failures:
     - rust nightly
diff --git a/README.md b/README.md
index 0e1ebc355..481d065b0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Rust Analyzer
 
 [![Build Status](https://travis-ci.org/rust-analyzer/rust-analyzer.svg?branch=master)](https://travis-ci.org/rust-analyzer/rust-analyzer)
-[![Build status](https://ci.appveyor.com/api/projects/status/j56x1hbje8rdg6xk/branch/master?svg=true)](https://ci.appveyor.com/project/rust-analyzer/rust-analyzer/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/vtt455oi3hjy9uvk/branch/master?svg=true)](https://ci.appveyor.com/project/matklad/rust-analyzer/branch/master)
 
 
 Rust Analyzer is an **experimental** modular compiler frontend for the
diff --git a/bors.toml b/bors.toml
index ee7961784..dcf1bd1ef 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,5 +1,5 @@
 status = [
   "continuous-integration/travis-ci/push",
-  "continuous-integration/appveyor/branch"
+  # "continuous-integration/appveyor/branch"
 ]
 delete_merged_branches = true
diff --git a/crates/ra_editor/src/extend_selection.rs b/crates/ra_editor/src/extend_selection.rs
index e12346cb6..ab03a717e 100644
--- a/crates/ra_editor/src/extend_selection.rs
+++ b/crates/ra_editor/src/extend_selection.rs
@@ -43,17 +43,17 @@ pub(crate) fn extend(root: SyntaxNodeRef, range: TextRange) -> Option<TextRange>
 }
 
 fn extend_single_word_in_comment(leaf: SyntaxNodeRef, offset: TextUnit) -> Option<TextRange> {
-    let text : &str = leaf.leaf_text()?;
+    let text: &str = leaf.leaf_text()?;
     let cursor_position: u32 = (offset - leaf.range().start()).into();
 
     let (before, after) = text.split_at(cursor_position as usize);
     let start_idx = before.rfind(char::is_whitespace)? as u32;
     let end_idx = after.find(char::is_whitespace)? as u32;
 
-    let from : TextUnit = (start_idx + 1).into();
-    let to : TextUnit = (cursor_position + end_idx).into();
+    let from: TextUnit = (start_idx + 1).into();
+    let to: TextUnit = (cursor_position + end_idx).into();
 
-    Some(TextRange::from_to(from, to))
+    Some(TextRange::from_to(from, to) + leaf.range().start())
 }
 
 fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange {
@@ -219,5 +219,14 @@ fn main() { foo+<|>bar;}
             r#"// foo bar b<|>az quxx"#,
             &["baz", "// foo bar baz quxx"]
         );
+        do_check(r#"
+impl S {
+    fn foo() {
+        // hel<|>lo world
+    }
+}
+        "#,
+            &["hello", "// hello world"]
+        );
     }
 }