Making use of bufnr to fetch correct buffer text.

Close #659.

Author: Junfeng Li

autoload/LSP.vim

@@ -2,8 +2,10 @@ function! LSP#filename() abort
     return expand('%:p')
 endfunction
 
-function! LSP#text() abort
-    let l:lines = getline(1, '$')
+function! LSP#text(...) abort
+    let l:buf = get(a:000, 0, '')
+
+    let l:lines = getbufline(l:buf, 1, '$')
     if l:lines[-1] !=# '' && &fixendofline
         let l:lines += ['']
     endif

autoload/LanguageClient.vim

@@ -447,7 +447,7 @@ function! LanguageClient#Call(method, params, callback, ...) abort
     let l:params = a:params
     if type(a:params) == s:TYPE.dict && !skipAddParams
         let l:params = extend({
-                    \ 'buftype': &buftype,
+                    \ 'bufnr': bufnr(''),
                     \ 'languageId': &filetype,
                     \ }, l:params)
     endif
@@ -468,7 +468,7 @@ function! LanguageClient#Notify(method, params) abort
     let l:params = a:params
     if type(params) == s:TYPE.dict
         let l:params = extend({
-                    \ 'buftype': &buftype,
+                    \ 'bufnr': bufnr(''),
                     \ 'languageId': &filetype,
                     \ }, l:params)
     endif

src/languageclient.rs

@@ -1722,14 +1722,17 @@ impl State {
 
     pub fn textDocument_didChange(&mut self, params: &Value) -> Fallible<()> {
         info!("Begin {}", lsp::notification::DidChangeTextDocument::METHOD);
-        let (languageId, filename): (String, String) =
-            self.gather_args(&[VimVar::LanguageId, VimVar::Filename], params)?;
+        let (bufnr, languageId, filename): (u64, String, String) = self.gather_args(
+            &[VimVar::Bufnr, VimVar::LanguageId, VimVar::Filename],
+            params,
+        )?;
         if !self.get(|state| Ok(state.text_documents.contains_key(&filename)))? {
             info!("Not opened yet. Switching to didOpen.");
             return self.textDocument_didOpen(params);
         }
 
-        let (text,): (Vec<String>,) = self.gather_args(&[VimVar::Text], params)?;
+        let (text,): (Vec<String>,) =
+            self.gather_args(&[format!("LSP#text({})", bufnr)], params)?;
 
         let text = text.join("\n");
         let text_state = self

src/types.rs

@@ -835,6 +835,7 @@ impl ToUsize for u64 {
 
 #[derive(Debug, PartialEq)]
 pub enum VimVar {
+    Bufnr,
     LanguageId,
     Filename,
     Line,
@@ -855,6 +856,7 @@ pub trait VimExp {
 impl VimExp for VimVar {
     fn to_key(&self) -> String {
         match *self {
+            VimVar::Bufnr => "bufnr",
             VimVar::LanguageId => "languageId",
             VimVar::Filename => "filename",
             VimVar::Line => "line",
@@ -870,6 +872,7 @@ impl VimExp for VimVar {
 
     fn to_exp(&self) -> String {
         match *self {
+            VimVar::Bufnr => "bufnr('')",
             VimVar::LanguageId => "&filetype",
             VimVar::Filename => "LSP#filename()",
             VimVar::Line => "LSP#line()",