Skip to content

Commit c61337b

Browse files
committed
defination jumping bugfix
1 parent ec00f05 commit c61337b

File tree

21 files changed

+39
-26
lines changed

21 files changed

+39
-26
lines changed

autoload/easycomplete.vim

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,14 +2555,14 @@ endfunction
25552555

25562556
" LSP definition 跳转的通用封装
25572557
" file_exts 文件后缀
2558-
function! easycomplete#DoLspDefinition(file_exts)
2559-
let ext = tolower(easycomplete#util#extention())
2560-
if index(a:file_exts, ext) >= 0
2558+
function! easycomplete#DoLspDefinition(...)
2559+
if easycomplete#util#FitLspFiletype()
25612560
return easycomplete#action#defination#LspRequest()
2561+
else
2562+
" exec "tag ". expand('<cword>')
2563+
" 未成功跳转,则交给主进程处理
2564+
return v:false
25622565
endif
2563-
" exec "tag ". expand('<cword>')
2564-
" 未成功跳转,则交给主进程处理
2565-
return v:false
25662566
endfunction
25672567

25682568
" lsp 各项配置检查是否通过

autoload/easycomplete/sources/bash.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ function! easycomplete#sources#bash#completor(opt, ctx) abort
1313
endfunction
1414

1515
function! easycomplete#sources#bash#GotoDefinition(...)
16-
return easycomplete#DoLspDefinition(["sh"])
16+
return easycomplete#DoLspDefinition()
1717
endfunction
1818

autoload/easycomplete/sources/cmake.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function! easycomplete#sources#cmake#completor(opt, ctx) abort
1515
endfunction
1616

1717
function! easycomplete#sources#cmake#GotoDefinition(...)
18-
return easycomplete#DoLspDefinition(["cmake", "make", "txt"])
18+
return easycomplete#DoLspDefinition()
1919
endfunction
2020

2121

autoload/easycomplete/sources/cpp.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function! easycomplete#sources#cpp#completor(opt, ctx) abort
1515
endfunction
1616

1717
function! easycomplete#sources#cpp#GotoDefinition(...)
18-
return easycomplete#DoLspDefinition(["cpp","c","h","cc","objc","objcpp","m","hpp"])
18+
return easycomplete#DoLspDefinition()
1919
endfunction
2020

2121
function! easycomplete#sources#cpp#filter(matches, ctx)

autoload/easycomplete/sources/cs.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ function! easycomplete#sources#cs#completor(opt, ctx) abort
1313
endfunction
1414

1515
function! easycomplete#sources#cs#GotoDefinition(...)
16-
return easycomplete#DoLspDefinition(["cs"])
16+
return easycomplete#DoLspDefinition()
1717
endfunction
1818

autoload/easycomplete/sources/dart.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function! easycomplete#sources#dart#completor(opt, ctx) abort
2323
endfunction
2424

2525
function! easycomplete#sources#dart#GotoDefinition(...)
26-
return easycomplete#DoLspDefinition(["dart"])
26+
return easycomplete#DoLspDefinition()
2727
endfunction
2828

2929

autoload/easycomplete/sources/deno.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function! easycomplete#sources#deno#completor(opt, ctx) abort
6060
endfunction
6161

6262
function! easycomplete#sources#deno#GotoDefinition(...)
63-
return easycomplete#DoLspDefinition(s:file_extensions)
63+
return easycomplete#DoLspDefinition()
6464
endfunction
6565

6666
function! easycomplete#sources#deno#cache()

autoload/easycomplete/sources/go.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function! easycomplete#sources#go#completor(opt, ctx) abort
2020
endfunction
2121

2222
function! easycomplete#sources#go#GotoDefinition(...)
23-
return easycomplete#DoLspDefinition(["go"])
23+
return easycomplete#DoLspDefinition()
2424
endfunction
2525

2626
function! easycomplete#sources#go#filter(matches, ctx)

autoload/easycomplete/sources/grvy.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ function! easycomplete#sources#grvy#completor(opt, ctx) abort
1212
endfunction
1313

1414
function! easycomplete#sources#grvy#GotoDefinition(...)
15-
return easycomplete#DoLspDefinition(["groovy","gradle"])
15+
return easycomplete#DoLspDefinition()
1616
endfunction
1717

autoload/easycomplete/sources/java.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function! easycomplete#sources#java#completor(opt, ctx) abort
1313
endfunction
1414

1515
function! easycomplete#sources#java#GotoDefinition(...)
16-
return easycomplete#DoLspDefinition(["java"])
16+
return easycomplete#DoLspDefinition()
1717
endfunction
1818

1919
function! s:log(...)

0 commit comments

Comments
 (0)