2 files changed, 17 insertions, 8 deletions

diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 06443bb76..ce50fb301 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -416,11 +416,20 @@ impl<'a> PoolDispatcher<'a> {
                             }
                             Err(e) => {
                                 if is_canceled(&e) {
-                                    RawResponse::err(
+                                    // FIXME: When https://github.com/Microsoft/vscode-languageserver-node/issues/457
+                                    // gets fixed, we can return the proper response.
+                                    // This works around the issue where "content modified" error would continuously
+                                    // show an message pop-up in VsCode
+                                    // RawResponse::err(
+                                    //     id,
+                                    //     ErrorCode::ContentModified as i32,
+                                    //     "content modified".to_string(),
+                                    // )
+                                    RawResponse {
                                         id,
-                                        ErrorCode::ContentModified as i32,
-                                        "content modified".to_string(),
-                                    )
+                                        result: Some(serde_json::to_value(&()).unwrap()),
+                                        error: None,
+                                    }
                                 } else {
                                     RawResponse::err(
                                         id,
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index c1472bbe5..4b1d1d3ca 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -8,7 +8,7 @@ use ra_syntax::{
 #[derive(Default)]
 pub struct TokenMap {
     /// Maps `tt::TokenId` to the *relative* source range.
-    toknes: Vec<TextRange>,
+    tokens: Vec<TextRange>,
 }
 
 /// Convert the syntax tree (what user has written) to a `TokenTree` (what macro
@@ -32,12 +32,12 @@ pub fn token_tree_to_ast_item_list(tt: &tt::Subtree) -> TreeArc<ast::SourceFile>
 impl TokenMap {
     pub fn relative_range_of(&self, tt: tt::TokenId) -> Option<TextRange> {
         let idx = tt.0 as usize;
-        self.toknes.get(idx).map(|&it| it)
+        self.tokens.get(idx).map(|&it| it)
     }
 
     fn alloc(&mut self, relative_range: TextRange) -> tt::TokenId {
-        let id = self.toknes.len();
-        self.toknes.push(relative_range);
+        let id = self.tokens.len();
+        self.tokens.push(relative_range);
         tt::TokenId(id as u32)
     }
 }