Fix RangeFormatting range end.

Close #444.

Author: Junfeng Li

autoload/LSP.vim

@@ -17,3 +17,11 @@ endfunction
 function! LSP#character()
     return col('.') - 1
 endfunction
+
+function! LSP#range_start_line()
+    return v:lnum - 1
+endfunction
+
+function! LSP#range_end_line()
+    return v:lnum - 1 + v:count
+endfunction

autoload/LanguageClient.vim

@@ -521,6 +521,10 @@ function! LanguageClient#textDocument_rangeFormatting(...) abort
                 \ 'text': LSP#text(),
                 \ 'line': LSP#line(),
                 \ 'character': LSP#character(),
+                \ '&tabstop': &tabstop,
+                \ '&expandtab': &expandtab,
+                \ 'LSP#range_start_line()': LSP#range_start_line(),
+                \ 'LSP#range_end_line()': LSP#range_end_line(),
                 \ 'handle': s:IsFalse(l:callback),
                 \ }
     call extend(l:params, get(a:000, 0, {}))

src/languageclient.rs

@@ -1257,34 +1257,22 @@ impl State {
     pub fn textDocument_rangeFormatting(&mut self, params: &Option<Params>) -> Result<Value> {
         self.textDocument_didChange(params)?;
         info!("Begin {}", lsp::request::RangeFormatting::METHOD);
-        let (buftype, languageId, filename, handle): (String, String, String, bool) = self.gather_args(
-            &[
-                VimVar::Buftype,
-                VimVar::LanguageId,
-                VimVar::Filename,
-                VimVar::Handle,
-            ],
-            params,
-        )?;
+        let (buftype, languageId, filename, handle, tab_size, insert_spaces, start_line, end_line):
+            (String, String, String, bool, u64, u64, u64, u64) = self.gather_args(
+                &[
+                VimVar::Buftype.to_key().as_str(),
+                VimVar::LanguageId.to_key().as_str(),
+                VimVar::Filename.to_key().as_str(),
+                VimVar::Handle.to_key().as_str(),
+                "&tabstop",
+                "&expandtab",
+                "LSP#range_start_line()",
+                "LSP#range_end_line()",
+                ], params)?;
         if !buftype.is_empty() || languageId.is_empty() {
             return Ok(Value::Null);
         }
 
-        let (tab_size, insert_spaces, start_line, end_line, end_character): (
-            u64,
-            u64,
-            u64,
-            u64,
-            u64,
-        ) = self.eval(
-            [
-                "&tabstop",
-                "&expandtab",
-                "v:lnum - 1",
-                "v:lnum - 1 + v:count - 1",
-                "len(getline(v:lnum + v:count - 1))",
-            ].as_ref(),
-        )?;
         let insert_spaces = insert_spaces == 1;
         let result = self.call(
             Some(&languageId),
@@ -1305,7 +1293,7 @@ impl State {
                     },
                     end: Position {
                         line: end_line,
-                        character: end_character,
+                        character: 0,
                     },
                 },
             },

tests/data/vimrc

@@ -24,6 +24,8 @@ let g:LanguageClient_serverCommands = {
     \ 'rust': ['rustup', 'run', 'stable', 'rls'],
     \ }
 let g:LanguageClient_selectionUI = 'location-list'
+set formatexpr=LanguageClient#textDocument_rangeFormatting_sync()
+set signcolumn=yes
 
 function! HandleWindowProgress(params) abort
     echomsg json_encode(a:params)