Skip to content

Commit b22c726

Browse files
committed
bugfix for zig
1 parent 44953bc commit b22c726

File tree

12 files changed

+43
-32
lines changed

12 files changed

+43
-32
lines changed

autoload/easycomplete/action/completion.vim

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ function! s:HandleLspCallback(server_name, plugin_name, data) abort
5656
let l:matches = l:result['matches']
5757
let l:startcol = l:ctx['startcol']
5858

59-
if a:server_name == "zls"
60-
let l:matches = easycomplete#sources#zig#GetFullItems(l:matches)
61-
endif
62-
63-
let l:matches = s:MatchResultFilterPipe(a:plugin_name, l:matches)
59+
let l:matches = s:MatchResultFilterPipe(a:plugin_name, l:matches, l:ctx)
6460
call easycomplete#complete(a:plugin_name, l:ctx, l:startcol, l:matches)
6561
endfunction
6662

@@ -73,7 +69,7 @@ function! s:GetLspCompletionResult(server_name, data, plugin_name) abort
7369
return {'matches': l:completion_result['items'], 'incomplete': l:completion_result['incomplete'] }
7470
endfunction
7571

76-
function! s:MatchResultFilterPipe(plugin_name, matches)
72+
function! s:MatchResultFilterPipe(plugin_name, matches, ctx)
7773
let lsp_ctx = easycomplete#GetCurrentLspContext()
7874
if type(get(lsp_ctx, "constructor")) != type('')
7975
let fn_name = a:plugin_name
@@ -85,7 +81,7 @@ function! s:MatchResultFilterPipe(plugin_name, matches)
8581
if !easycomplete#util#FuncExists(Fun_name)
8682
return a:matches
8783
endif
88-
return call(funcref(Fun_name), [a:matches])
84+
return call(funcref(Fun_name), [a:matches, a:ctx])
8985
endfunction
9086

9187
function! s:console(...)

autoload/easycomplete/sources/cpp.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function! easycomplete#sources#cpp#GotoDefinition(...)
1818
return easycomplete#DoLspDefinition(["cpp","c","h","cc","objc","objcpp","m","hpp"])
1919
endfunction
2020

21-
function! easycomplete#sources#cpp#filter(matches)
22-
let ctx = easycomplete#context()
21+
function! easycomplete#sources#cpp#filter(matches, ctx)
22+
let ctx = a:ctx
2323
let matches = map(copy(a:matches), function("easycomplete#util#FunctionSurffixMap"))
2424
let matches_ret = map(copy(matches), function("s:CppItemPrefixHandling"))
2525
return matches_ret

autoload/easycomplete/sources/deno.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ function! s:CachePost(job, code, ...) abort
101101
call easycomplete#util#timer_start('easycomplete#util#info', ['`deno cache` Finished!'], 10)
102102
endfunction
103103

104-
function! easycomplete#sources#deno#filter(matches)
105-
let ctx = easycomplete#context()
104+
function! easycomplete#sources#deno#filter(matches, ctx)
105+
let ctx = a:ctx
106106
let matches = a:matches
107107
let matches = map(copy(matches), function("easycomplete#util#FunctionSurffixMap"))
108108
return matches

autoload/easycomplete/sources/go.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function! easycomplete#sources#go#GotoDefinition(...)
2323
return easycomplete#DoLspDefinition(["go"])
2424
endfunction
2525

26-
function! easycomplete#sources#go#filter(matches)
27-
let ctx = easycomplete#context()
26+
function! easycomplete#sources#go#filter(matches, ctx)
27+
let ctx = a:ctx
2828
let matches = a:matches
2929
let matches = map(copy(matches), function("easycomplete#util#FunctionSurffixMap"))
3030
return matches

autoload/easycomplete/sources/json.vim

Lines changed: 2 additions & 6 deletions
Large diffs are not rendered by default.

autoload/easycomplete/sources/kotlin.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ function! easycomplete#sources#kotlin#GotoDefinition(...)
1717
return easycomplete#DoLspDefinition(["kt"])
1818
endfunction
1919

20-
function! easycomplete#sources#kotlin#filter(matches)
21-
let ctx = easycomplete#context()
20+
function! easycomplete#sources#kotlin#filter(matches, ctx)
21+
let ctx = a:ctx
2222
let matches = a:matches
2323
let matches = map(copy(matches), function("easycomplete#util#FunctionSurffixMap"))
2424
return matches

autoload/easycomplete/sources/lua.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ function! easycomplete#sources#lua#GotoDefinition(...)
6767
return easycomplete#DoLspDefinition(["lua"])
6868
endfunction
6969

70-
function! easycomplete#sources#lua#filter(matches)
71-
let ctx = easycomplete#context()
70+
function! easycomplete#sources#lua#filter(matches, ctx)
71+
let ctx = a:ctx
7272
let matches = a:matches
7373
if ctx['typed'] =~ '\(\w\+\.\)\{-1,}$' " LoaDotTyping bugfix for #196
7474
call filter(matches, function("s:LuaHack_S_DotFilter"))

autoload/easycomplete/sources/php.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ function! easycomplete#sources#php#GotoDefinition(...)
1616
return easycomplete#DoLspDefinition(["php"])
1717
endfunction
1818

19-
function! easycomplete#sources#php#filter(matches)
20-
let ctx = easycomplete#context()
19+
function! easycomplete#sources#php#filter(matches, ctx)
20+
let ctx = a:ctx
2121
let matches = a:matches
2222
let matches = map(copy(matches), function("easycomplete#util#FunctionSurffixMap"))
2323
return matches

autoload/easycomplete/sources/py.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ function! easycomplete#sources#py#GotoDefinition(...)
1515
return easycomplete#DoLspDefinition(["py", "pyi"])
1616
endfunction
1717

18-
function! easycomplete#sources#py#filter(matches)
19-
let ctx = easycomplete#context()
18+
function! easycomplete#sources#py#filter(matches, ctx)
19+
let ctx = a:ctx
2020
let matches = a:matches
2121
let matches = map(copy(matches), function("easycomplete#util#FunctionSurffixMap"))
2222
return matches

autoload/easycomplete/sources/vim.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ function! easycomplete#sources#vim#GotoDefinition(...)
2424
endfunction
2525

2626
" hack for #98 #92
27-
function! easycomplete#sources#vim#filter(matches)
28-
let ctx = easycomplete#context()
27+
function! easycomplete#sources#vim#filter(matches, ctx)
28+
let ctx = a:ctx
2929
let matches = a:matches
3030
if ctx['typed'] =~ "s:\\w\\{-}$"
3131
" hack for vim-language-server:

0 commit comments

Comments
 (0)