Buffer local var override global.

Junfeng Li · Junfeng Li · commit 8b51819192c4 · 2018-11-19T21:38:52.000-08:00
Close #651.
diff --git a/autoload/LanguageClient.vim b/autoload/LanguageClient.vim
@@ -191,7 +191,7 @@ endfunction
 " Get an variable value.
 " First try buffer local, then global, then default, then v:null.
 function! s:GetVar(...) abort
-    let name = a:0
+    let name = a:1
 
     if exists('b:' . name)
         return get(b:, name)
diff --git a/src/languageclient.rs b/src/languageclient.rs
@@ -104,7 +104,7 @@ impl State {
         ) = self.eval(
             [
                 "!!get(g:, 'LanguageClient_autoStart', 1)",
-                "get(g:, 'LanguageClient_serverCommands', {})",
+                "s:GetVar('LanguageClient_serverCommands', {})",
                 "get(g:, 'LanguageClient_selectionUI', v:null)",
                 "get(g:, 'LanguageClient_trace', v:null)",
                 "expand(get(g:, 'LanguageClient_settingsPath', '.vim/settings.json'))",

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ impl State {`
`104`	`104`	`) = self.eval(`
`105`	`105`	`[`
`106`	`106`	`"!!get(g:, 'LanguageClient_autoStart', 1)",`
`107`		`- "get(g:, 'LanguageClient_serverCommands', {})",`
	`107`	`+ "s:GetVar('LanguageClient_serverCommands', {})",`
`108`	`108`	`"get(g:, 'LanguageClient_selectionUI', v:null)",`
`109`	`109`	`"get(g:, 'LanguageClient_trace', v:null)",`
`110`	`110`	`"expand(get(g:, 'LanguageClient_settingsPath', '.vim/settings.json'))",`