diff --git a/.gitignore b/.gitignore index 8ad5459..883a84a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +doc/tags utils/stylua + diff --git a/autoload/cmp.vim b/autoload/cmp.vim index 8fcdeeb..43b8cc2 100644 --- a/autoload/cmp.vim +++ b/autoload/cmp.vim @@ -1,18 +1,6 @@ let s:bridge_id = 0 let s:sources = {} -" -" cmp#apply_text_edits -" -" TODO: Remove this if nvim's apply_text_edits will be improved. -" -function! cmp#apply_text_edits(bufnr, text_edits) abort - if !exists('s:TextEdit') - let s:TextEdit = vital#cmp#import('VS.LSP.TextEdit') - endif - call s:TextEdit.apply(a:bufnr, a:text_edits) -endfunction - " " cmp#register_source " diff --git a/autoload/vital/_cmp.vim b/autoload/vital/_cmp.vim deleted file mode 100644 index 5510495..0000000 --- a/autoload/vital/_cmp.vim +++ /dev/null @@ -1,9 +0,0 @@ -let s:_plugin_name = expand(':t:r') - -function! vital#{s:_plugin_name}#new() abort - return vital#{s:_plugin_name[1:]}#new() -endfunction - -function! vital#{s:_plugin_name}#function(funcname) abort - silent! return function(a:funcname) -endfunction diff --git a/autoload/vital/_cmp/VS/LSP/Position.vim b/autoload/vital/_cmp/VS/LSP/Position.vim deleted file mode 100644 index f53c76a..0000000 --- a/autoload/vital/_cmp/VS/LSP/Position.vim +++ /dev/null @@ -1,62 +0,0 @@ -" ___vital___ -" NOTE: lines between '" ___vital___' is generated by :Vitalize. -" Do not modify the code nor insert new lines before '" ___vital___' -function! s:_SID() abort - return matchstr(expand(''), '\zs\d\+\ze__SID$') -endfunction -execute join(['function! vital#_cmp#VS#LSP#Position#import() abort', printf("return map({'cursor': '', 'vim_to_lsp': '', 'lsp_to_vim': ''}, \"vital#_cmp#function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") -delfunction s:_SID -" ___vital___ -" -" cursor -" -function! s:cursor() abort - return s:vim_to_lsp('%', getpos('.')[1 : 3]) -endfunction - -" -" vim_to_lsp -" -function! s:vim_to_lsp(expr, pos) abort - let l:line = s:_get_buffer_line(a:expr, a:pos[0]) - if l:line is v:null - return { - \ 'line': a:pos[0] - 1, - \ 'character': a:pos[1] - 1 - \ } - endif - - return { - \ 'line': a:pos[0] - 1, - \ 'character': strchars(strpart(l:line, 0, a:pos[1] - 1)) - \ } -endfunction - -" -" lsp_to_vim -" -function! s:lsp_to_vim(expr, position) abort - let l:line = s:_get_buffer_line(a:expr, a:position.line + 1) - if l:line is v:null - return [a:position.line + 1, a:position.character + 1] - endif - return [a:position.line + 1, byteidx(l:line, a:position.character) + 1] -endfunction - -" -" _get_buffer_line -" -function! s:_get_buffer_line(expr, lnum) abort - try - let l:expr = bufnr(a:expr) - catch /.*/ - let l:expr = a:expr - endtry - if bufloaded(l:expr) - return get(getbufline(l:expr, a:lnum), 0, v:null) - elseif filereadable(a:expr) - return get(readfile(a:expr, '', a:lnum), 0, v:null) - endif - return v:null -endfunction - diff --git a/autoload/vital/_cmp/VS/LSP/Text.vim b/autoload/vital/_cmp/VS/LSP/Text.vim deleted file mode 100644 index 0c09314..0000000 --- a/autoload/vital/_cmp/VS/LSP/Text.vim +++ /dev/null @@ -1,23 +0,0 @@ -" ___vital___ -" NOTE: lines between '" ___vital___' is generated by :Vitalize. -" Do not modify the code nor insert new lines before '" ___vital___' -function! s:_SID() abort - return matchstr(expand(''), '\zs\d\+\ze__SID$') -endfunction -execute join(['function! vital#_cmp#VS#LSP#Text#import() abort', printf("return map({'normalize_eol': '', 'split_by_eol': ''}, \"vital#_cmp#function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") -delfunction s:_SID -" ___vital___ -" -" normalize_eol -" -function! s:normalize_eol(text) abort - return substitute(a:text, "\r\n\\|\r", "\n", 'g') -endfunction - -" -" split_by_eol -" -function! s:split_by_eol(text) abort - return split(a:text, "\r\n\\|\r\\|\n", v:true) -endfunction - diff --git a/autoload/vital/_cmp/VS/LSP/TextEdit.vim b/autoload/vital/_cmp/VS/LSP/TextEdit.vim deleted file mode 100644 index 09a8df8..0000000 --- a/autoload/vital/_cmp/VS/LSP/TextEdit.vim +++ /dev/null @@ -1,185 +0,0 @@ -" ___vital___ -" NOTE: lines between '" ___vital___' is generated by :Vitalize. -" Do not modify the code nor insert new lines before '" ___vital___' -function! s:_SID() abort - return matchstr(expand(''), '\zs\d\+\ze__SID$') -endfunction -execute join(['function! vital#_cmp#VS#LSP#TextEdit#import() abort', printf("return map({'_vital_depends': '', 'apply': '', '_vital_loaded': ''}, \"vital#_cmp#function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") -delfunction s:_SID -" ___vital___ -" -" _vital_loaded -" -function! s:_vital_loaded(V) abort - let s:Text = a:V.import('VS.LSP.Text') - let s:Position = a:V.import('VS.LSP.Position') - let s:Buffer = a:V.import('VS.Vim.Buffer') - let s:Option = a:V.import('VS.Vim.Option') -endfunction - -" -" _vital_depends -" -function! s:_vital_depends() abort - return ['VS.LSP.Text', 'VS.LSP.Position', 'VS.Vim.Buffer', 'VS.Vim.Option'] -endfunction - -" -" apply -" -function! s:apply(path, text_edits) abort - let l:current_bufname = bufname('%') - let l:current_position = s:Position.cursor() - - let l:target_bufnr = s:_switch(a:path) - call s:_substitute(l:target_bufnr, a:text_edits, l:current_position) - let l:current_bufnr = s:_switch(l:current_bufname) - - if l:current_bufnr == l:target_bufnr - call cursor(s:Position.lsp_to_vim('%', l:current_position)) - endif -endfunction - -" -" _substitute -" -function! s:_substitute(bufnr, text_edits, current_position) abort - try - " Save state. - let l:Restore = s:Option.define({ - \ 'foldenable': '0', - \ }) - let l:view = winsaveview() - - " Apply substitute. - let [l:fixeol, l:text_edits] = s:_normalize(a:bufnr, a:text_edits) - for l:text_edit in l:text_edits - let l:start = s:Position.lsp_to_vim(a:bufnr, l:text_edit.range.start) - let l:end = s:Position.lsp_to_vim(a:bufnr, l:text_edit.range.end) - let l:text = s:Text.normalize_eol(l:text_edit.newText) - execute printf('noautocmd keeppatterns keepjumps silent %ssubstitute/\%%%sl\%%%sc\_.\{-}\%%%sl\%%%sc/\=l:text/%se', - \ l:start[0], - \ l:start[0], - \ l:start[1], - \ l:end[0], - \ l:end[1], - \ &gdefault ? 'g' : '' - \ ) - call s:_fix_cursor_position(a:current_position, l:text_edit, s:Text.split_by_eol(l:text)) - endfor - - " Remove last empty line if fixeol enabled. - if l:fixeol && getline('$') ==# '' - noautocmd keeppatterns keepjumps silent $delete _ - endif - catch /.*/ - echomsg string({ 'exception': v:exception, 'throwpoint': v:throwpoint }) - finally - " Restore state. - call l:Restore() - call winrestview(l:view) - endtry -endfunction - -" -" _fix_cursor_position -" -function! s:_fix_cursor_position(position, text_edit, lines) abort - let l:lines_len = len(a:lines) - let l:range_len = (a:text_edit.range.end.line - a:text_edit.range.start.line) + 1 - - if a:text_edit.range.end.line < a:position.line - let a:position.line += l:lines_len - l:range_len - elseif a:text_edit.range.end.line == a:position.line && a:text_edit.range.end.character <= a:position.character - let a:position.line += l:lines_len - l:range_len - let a:position.character = strchars(a:lines[-1]) + (a:position.character - a:text_edit.range.end.character) - if l:lines_len == 1 - let a:position.character += a:text_edit.range.start.character - endif - endif -endfunction - -" -" _normalize -" -function! s:_normalize(bufnr, text_edits) abort - let l:text_edits = type(a:text_edits) == type([]) ? a:text_edits : [a:text_edits] - let l:text_edits = s:_range(l:text_edits) - let l:text_edits = sort(l:text_edits, function('s:_compare')) - let l:text_edits = reverse(l:text_edits) - return s:_fix_text_edits(a:bufnr, l:text_edits) -endfunction - -" -" _range -" -function! s:_range(text_edits) abort - let l:text_edits = [] - for l:text_edit in a:text_edits - if type(l:text_edit) != type({}) - continue - endif - if l:text_edit.range.start.line > l:text_edit.range.end.line || ( - \ l:text_edit.range.start.line == l:text_edit.range.end.line && - \ l:text_edit.range.start.character > l:text_edit.range.end.character - \ ) - let l:text_edit.range = { 'start': l:text_edit.range.end, 'end': l:text_edit.range.start } - endif - let l:text_edits += [l:text_edit] - endfor - return l:text_edits -endfunction - -" -" _compare -" -function! s:_compare(text_edit1, text_edit2) abort - let l:diff = a:text_edit1.range.start.line - a:text_edit2.range.start.line - if l:diff == 0 - return a:text_edit1.range.start.character - a:text_edit2.range.start.character - endif - return l:diff -endfunction - -" -" _fix_text_edits -" -function! s:_fix_text_edits(bufnr, text_edits) abort - let l:max = s:Buffer.get_line_count(a:bufnr) - - let l:fixeol = v:false - let l:text_edits = [] - for l:text_edit in a:text_edits - if l:max <= l:text_edit.range.start.line - let l:text_edit.range.start.line = l:max - 1 - let l:text_edit.range.start.character = strchars(get(getbufline(a:bufnr, '$'), 0, '')) - let l:text_edit.newText = "\n" . l:text_edit.newText - let l:fixeol = &fixendofline && !&binary - endif - if l:max <= l:text_edit.range.end.line - let l:text_edit.range.end.line = l:max - 1 - let l:text_edit.range.end.character = strchars(get(getbufline(a:bufnr, '$'), 0, '')) - let l:fixeol = &fixendofline && !&binary - endif - call add(l:text_edits, l:text_edit) - endfor - - return [l:fixeol, l:text_edits] -endfunction - -" -" _switch -" -function! s:_switch(path) abort - let l:curr = bufnr('%') - let l:next = bufnr(a:path) - if l:next >= 0 - if l:curr != l:next - execute printf('noautocmd keepalt keepjumps %sbuffer!', bufnr(a:path)) - endif - else - execute printf('noautocmd keepalt keepjumps edit! %s', fnameescape(a:path)) - endif - return bufnr('%') -endfunction - diff --git a/autoload/vital/_cmp/VS/Vim/Buffer.vim b/autoload/vital/_cmp/VS/Vim/Buffer.vim deleted file mode 100644 index df58dcd..0000000 --- a/autoload/vital/_cmp/VS/Vim/Buffer.vim +++ /dev/null @@ -1,126 +0,0 @@ -" ___vital___ -" NOTE: lines between '" ___vital___' is generated by :Vitalize. -" Do not modify the code nor insert new lines before '" ___vital___' -function! s:_SID() abort - return matchstr(expand(''), '\zs\d\+\ze__SID$') -endfunction -execute join(['function! vital#_cmp#VS#Vim#Buffer#import() abort', printf("return map({'get_line_count': '', 'do': '', 'create': '', 'pseudo': '', 'ensure': '', 'load': ''}, \"vital#_cmp#function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") -delfunction s:_SID -" ___vital___ -let s:Do = { -> {} } - -let g:___VS_Vim_Buffer_id = get(g:, '___VS_Vim_Buffer_id', 0) - -" -" get_line_count -" -if exists('*nvim_buf_line_count') - function! s:get_line_count(bufnr) abort - return nvim_buf_line_count(a:bufnr) - endfunction -elseif has('patch-8.2.0019') - function! s:get_line_count(bufnr) abort - return getbufinfo(a:bufnr)[0].linecount - endfunction -else - function! s:get_line_count(bufnr) abort - if bufnr('%') == bufnr(a:bufnr) - return line('$') - endif - return len(getbufline(a:bufnr, '^', '$')) - endfunction -endif - -" -" create -" -function! s:create(...) abort - let g:___VS_Vim_Buffer_id += 1 - let l:bufname = printf('VS.Vim.Buffer: %s: %s', - \ g:___VS_Vim_Buffer_id, - \ get(a:000, 0, 'VS.Vim.Buffer.Default') - \ ) - return s:load(l:bufname) -endfunction - -" -" ensure -" -function! s:ensure(expr) abort - if !bufexists(a:expr) - if type(a:expr) == type(0) - throw printf('VS.Vim.Buffer: `%s` is not valid expr.', a:expr) - endif - badd `=a:expr` - endif - return bufnr(a:expr) -endfunction - -" -" load -" -if exists('*bufload') - function! s:load(expr) abort - let l:bufnr = s:ensure(a:expr) - if !bufloaded(l:bufnr) - call bufload(l:bufnr) - endif - return l:bufnr - endfunction -else - function! s:load(expr) abort - let l:curr_bufnr = bufnr('%') - try - let l:bufnr = s:ensure(a:expr) - execute printf('keepalt keepjumps silent %sbuffer', l:bufnr) - catch /.*/ - echomsg string({ 'exception': v:exception, 'throwpoint': v:throwpoint }) - finally - execute printf('noautocmd keepalt keepjumps silent %sbuffer', l:curr_bufnr) - endtry - return l:bufnr - endfunction -endif - -" -" do -" -function! s:do(bufnr, func) abort - let l:curr_bufnr = bufnr('%') - if l:curr_bufnr == a:bufnr - call a:func() - return - endif - - try - execute printf('noautocmd keepalt keepjumps silent %sbuffer', a:bufnr) - call a:func() - catch /.*/ - echomsg string({ 'exception': v:exception, 'throwpoint': v:throwpoint }) - finally - execute printf('noautocmd keepalt keepjumps silent %sbuffer', l:curr_bufnr) - endtry -endfunction - -" -" pseudo -" -function! s:pseudo(filepath) abort - if !filereadable(a:filepath) - throw printf('VS.Vim.Buffer: `%s` is not valid filepath.', a:filepath) - endif - - " create pseudo buffer - let l:bufname = printf('VSVimBufferPseudo://%s', a:filepath) - if bufexists(l:bufname) - return s:ensure(l:bufname) - endif - - let l:bufnr = s:ensure(l:bufname) - let l:group = printf('VS_Vim_Buffer_pseudo:%s', l:bufnr) - execute printf('augroup %s', l:group) - execute printf('autocmd BufReadCmd call setline(1, readfile(bufname("%")[20 : -1])) | try | filetype detect | catch /.*/ | endtry | augroup %s | autocmd! | augroup END', l:bufnr, l:group) - augroup END - return l:bufnr -endfunction - diff --git a/autoload/vital/_cmp/VS/Vim/Option.vim b/autoload/vital/_cmp/VS/Vim/Option.vim deleted file mode 100644 index 0435133..0000000 --- a/autoload/vital/_cmp/VS/Vim/Option.vim +++ /dev/null @@ -1,21 +0,0 @@ -" ___vital___ -" NOTE: lines between '" ___vital___' is generated by :Vitalize. -" Do not modify the code nor insert new lines before '" ___vital___' -function! s:_SID() abort - return matchstr(expand(''), '\zs\d\+\ze__SID$') -endfunction -execute join(['function! vital#_cmp#VS#Vim#Option#import() abort', printf("return map({'define': ''}, \"vital#_cmp#function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") -delfunction s:_SID -" ___vital___ -" -" define -" -function! s:define(map) abort - let l:old = {} - for [l:key, l:value] in items(a:map) - let l:old[l:key] = eval(printf('&%s', l:key)) - execute printf('let &%s = "%s"', l:key, l:value) - endfor - return { -> s:define(l:old) } -endfunction - diff --git a/autoload/vital/cmp.vim b/autoload/vital/cmp.vim deleted file mode 100644 index 6730f4e..0000000 --- a/autoload/vital/cmp.vim +++ /dev/null @@ -1,330 +0,0 @@ -let s:plugin_name = expand(':t:r') -let s:vital_base_dir = expand(':h') -let s:project_root = expand(':h:h:h') -let s:is_vital_vim = s:plugin_name is# 'vital' - -let s:loaded = {} -let s:cache_sid = {} - -function! vital#{s:plugin_name}#new() abort - return s:new(s:plugin_name) -endfunction - -function! vital#{s:plugin_name}#import(...) abort - if !exists('s:V') - let s:V = s:new(s:plugin_name) - endif - return call(s:V.import, a:000, s:V) -endfunction - -let s:Vital = {} - -function! s:new(plugin_name) abort - let base = deepcopy(s:Vital) - let base._plugin_name = a:plugin_name - return base -endfunction - -function! s:vital_files() abort - if !exists('s:vital_files') - let s:vital_files = map( - \ s:is_vital_vim ? s:_global_vital_files() : s:_self_vital_files(), - \ 'fnamemodify(v:val, ":p:gs?[\\\\/]?/?")') - endif - return copy(s:vital_files) -endfunction -let s:Vital.vital_files = function('s:vital_files') - -function! s:import(name, ...) abort dict - let target = {} - let functions = [] - for a in a:000 - if type(a) == type({}) - let target = a - elseif type(a) == type([]) - let functions = a - endif - unlet a - endfor - let module = self._import(a:name) - if empty(functions) - call extend(target, module, 'keep') - else - for f in functions - if has_key(module, f) && !has_key(target, f) - let target[f] = module[f] - endif - endfor - endif - return target -endfunction -let s:Vital.import = function('s:import') - -function! s:load(...) abort dict - for arg in a:000 - let [name; as] = type(arg) == type([]) ? arg[: 1] : [arg, arg] - let target = split(join(as, ''), '\W\+') - let dict = self - let dict_type = type({}) - while !empty(target) - let ns = remove(target, 0) - if !has_key(dict, ns) - let dict[ns] = {} - endif - if type(dict[ns]) == dict_type - let dict = dict[ns] - else - unlet dict - break - endif - endwhile - if exists('dict') - call extend(dict, self._import(name)) - endif - unlet arg - endfor - return self -endfunction -let s:Vital.load = function('s:load') - -function! s:unload() abort dict - let s:loaded = {} - let s:cache_sid = {} - unlet! s:vital_files -endfunction -let s:Vital.unload = function('s:unload') - -function! s:exists(name) abort dict - if a:name !~# '\v^\u\w*%(\.\u\w*)*$' - throw 'vital: Invalid module name: ' . a:name - endif - return s:_module_path(a:name) isnot# '' -endfunction -let s:Vital.exists = function('s:exists') - -function! s:search(pattern) abort dict - let paths = s:_extract_files(a:pattern, self.vital_files()) - let modules = sort(map(paths, 's:_file2module(v:val)')) - return uniq(modules) -endfunction -let s:Vital.search = function('s:search') - -function! s:plugin_name() abort dict - return self._plugin_name -endfunction -let s:Vital.plugin_name = function('s:plugin_name') - -function! s:_self_vital_files() abort - let builtin = printf('%s/__%s__/', s:vital_base_dir, s:plugin_name) - let installed = printf('%s/_%s/', s:vital_base_dir, s:plugin_name) - let base = builtin . ',' . installed - return split(globpath(base, '**/*.vim', 1), "\n") -endfunction - -function! s:_global_vital_files() abort - let pattern = 'autoload/vital/__*__/**/*.vim' - return split(globpath(&runtimepath, pattern, 1), "\n") -endfunction - -function! s:_extract_files(pattern, files) abort - let tr = {'.': '/', '*': '[^/]*', '**': '.*'} - let target = substitute(a:pattern, '\.\|\*\*\?', '\=tr[submatch(0)]', 'g') - let regexp = printf('autoload/vital/[^/]\+/%s.vim$', target) - return filter(a:files, 'v:val =~# regexp') -endfunction - -function! s:_file2module(file) abort - let filename = fnamemodify(a:file, ':p:gs?[\\/]?/?') - let tail = matchstr(filename, 'autoload/vital/_\w\+/\zs.*\ze\.vim$') - return join(split(tail, '[\\/]\+'), '.') -endfunction - -" @param {string} name e.g. Data.List -function! s:_import(name) abort dict - if has_key(s:loaded, a:name) - return copy(s:loaded[a:name]) - endif - let module = self._get_module(a:name) - if has_key(module, '_vital_created') - call module._vital_created(module) - endif - let export_module = filter(copy(module), 'v:key =~# "^\\a"') - " Cache module before calling module._vital_loaded() to avoid cyclic - " dependences but remove the cache if module._vital_loaded() fails. - " let s:loaded[a:name] = export_module - let s:loaded[a:name] = export_module - if has_key(module, '_vital_loaded') - try - call module._vital_loaded(vital#{s:plugin_name}#new()) - catch - unlet s:loaded[a:name] - throw 'vital: fail to call ._vital_loaded(): ' . v:exception . " from:\n" . s:_format_throwpoint(v:throwpoint) - endtry - endif - return copy(s:loaded[a:name]) -endfunction -let s:Vital._import = function('s:_import') - -function! s:_format_throwpoint(throwpoint) abort - let funcs = [] - let stack = matchstr(a:throwpoint, '^function \zs.*, .\{-} \d\+$') - for line in split(stack, '\.\.') - let m = matchlist(line, '^\(.\+\)\%(\[\(\d\+\)\]\|, .\{-} \(\d\+\)\)$') - if !empty(m) - let [name, lnum, lnum2] = m[1:3] - if empty(lnum) - let lnum = lnum2 - endif - let info = s:_get_func_info(name) - if !empty(info) - let attrs = empty(info.attrs) ? '' : join([''] + info.attrs) - let flnum = info.lnum == 0 ? '' : printf(' Line:%d', info.lnum + lnum) - call add(funcs, printf('function %s(...)%s Line:%d (%s%s)', - \ info.funcname, attrs, lnum, info.filename, flnum)) - continue - endif - endif - " fallback when function information cannot be detected - call add(funcs, line) - endfor - return join(funcs, "\n") -endfunction - -function! s:_get_func_info(name) abort - let name = a:name - if a:name =~# '^\d\+$' " is anonymous-function - let name = printf('{%s}', a:name) - elseif a:name =~# '^\d\+$' " is lambda-function - let name = printf("{'%s'}", a:name) - endif - if !exists('*' . name) - return {} - endif - let body = execute(printf('verbose function %s', name)) - let lines = split(body, "\n") - let signature = matchstr(lines[0], '^\s*\zs.*') - let [_, file, lnum; __] = matchlist(lines[1], - \ '^\t\%(Last set from\|.\{-}:\)\s*\zs\(.\{-}\)\%( \S\+ \(\d\+\)\)\?$') - return { - \ 'filename': substitute(file, '[/\\]\+', '/', 'g'), - \ 'lnum': 0 + lnum, - \ 'funcname': a:name, - \ 'arguments': split(matchstr(signature, '(\zs.*\ze)'), '\s*,\s*'), - \ 'attrs': filter(['dict', 'abort', 'range', 'closure'], 'signature =~# (").*" . v:val)'), - \ } -endfunction - -" s:_get_module() returns module object wihch has all script local functions. -function! s:_get_module(name) abort dict - let funcname = s:_import_func_name(self.plugin_name(), a:name) - try - return call(funcname, []) - catch /^Vim\%((\a\+)\)\?:E117:/ - return s:_get_builtin_module(a:name) - endtry -endfunction - -function! s:_get_builtin_module(name) abort - return s:sid2sfuncs(s:_module_sid(a:name)) -endfunction - -if s:is_vital_vim - " For vital.vim, we can use s:_get_builtin_module directly - let s:Vital._get_module = function('s:_get_builtin_module') -else - let s:Vital._get_module = function('s:_get_module') -endif - -function! s:_import_func_name(plugin_name, module_name) abort - return printf('vital#_%s#%s#import', a:plugin_name, s:_dot_to_sharp(a:module_name)) -endfunction - -function! s:_module_sid(name) abort - let path = s:_module_path(a:name) - if !filereadable(path) - throw 'vital: module not found: ' . a:name - endif - let vital_dir = s:is_vital_vim ? '__\w\+__' : printf('_\{1,2}%s\%%(__\)\?', s:plugin_name) - let base = join([vital_dir, ''], '[/\\]\+') - let p = base . substitute('' . a:name, '\.', '[/\\\\]\\+', 'g') - let sid = s:_sid(path, p) - if !sid - call s:_source(path) - let sid = s:_sid(path, p) - if !sid - throw printf('vital: cannot get from path: %s', path) - endif - endif - return sid -endfunction - -function! s:_module_path(name) abort - return get(s:_extract_files(a:name, s:vital_files()), 0, '') -endfunction - -function! s:_module_sid_base_dir() abort - return s:is_vital_vim ? &rtp : s:project_root -endfunction - -function! s:_dot_to_sharp(name) abort - return substitute(a:name, '\.', '#', 'g') -endfunction - -function! s:_source(path) abort - execute 'source' fnameescape(a:path) -endfunction - -" @vimlint(EVL102, 1, l:_) -" @vimlint(EVL102, 1, l:__) -function! s:_sid(path, filter_pattern) abort - let unified_path = s:_unify_path(a:path) - if has_key(s:cache_sid, unified_path) - return s:cache_sid[unified_path] - endif - for line in filter(split(execute(':scriptnames'), "\n"), 'v:val =~# a:filter_pattern') - let [_, sid, path; __] = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$') - if s:_unify_path(path) is# unified_path - let s:cache_sid[unified_path] = sid - return s:cache_sid[unified_path] - endif - endfor - return 0 -endfunction - -if filereadable(expand(':r') . '.VIM') " is case-insensitive or not - let s:_unify_path_cache = {} - " resolve() is slow, so we cache results. - " Note: On windows, vim can't expand path names from 8.3 formats. - " So if getting full path via and $HOME was set as 8.3 format, - " vital load duplicated scripts. Below's :~ avoid this issue. - function! s:_unify_path(path) abort - if has_key(s:_unify_path_cache, a:path) - return s:_unify_path_cache[a:path] - endif - let value = tolower(fnamemodify(resolve(fnamemodify( - \ a:path, ':p')), ':~:gs?[\\/]?/?')) - let s:_unify_path_cache[a:path] = value - return value - endfunction -else - function! s:_unify_path(path) abort - return resolve(fnamemodify(a:path, ':p:gs?[\\/]?/?')) - endfunction -endif - -" copied and modified from Vim.ScriptLocal -let s:SNR = join(map(range(len("\")), '"[\\x" . printf("%0x", char2nr("\"[v:val])) . "]"'), '') -function! s:sid2sfuncs(sid) abort - let fs = split(execute(printf(':function /^%s%s_', s:SNR, a:sid)), "\n") - let r = {} - let pattern = printf('\m^function\s%d_\zs\w\{-}\ze(', a:sid) - for fname in map(fs, 'matchstr(v:val, pattern)') - let r[fname] = function(s:_sfuncname(a:sid, fname)) - endfor - return r -endfunction - -"" Return funcname of script local functions with SID -function! s:_sfuncname(sid, funcname) abort - return printf('%s_%s', a:sid, a:funcname) -endfunction diff --git a/autoload/vital/cmp.vital b/autoload/vital/cmp.vital deleted file mode 100644 index 1213d2a..0000000 --- a/autoload/vital/cmp.vital +++ /dev/null @@ -1,4 +0,0 @@ -cmp -2755f0c8fbd3442bcb7f567832e4d1455b57f9a2 - -VS.LSP.TextEdit diff --git a/lua/cmp/core.lua b/lua/cmp/core.lua index 24e9017..9347a21 100644 --- a/lua/cmp/core.lua +++ b/lua/cmp/core.lua @@ -314,8 +314,8 @@ core.confirm = function(self, e, option, callback) end end) feedkeys.call('', 'n', function() + local ctx = context.new() if #(misc.safe(e:get_completion_item().additionalTextEdits) or {}) == 0 then - local pre = context.new() e:resolve(function() local new = context.new() local text_edits = misc.safe(e:get_completion_item().additionalTextEdits) or {} @@ -324,8 +324,8 @@ core.confirm = function(self, e, option, callback) end local has_cursor_line_text_edit = (function() - local minrow = math.min(pre.cursor.row, new.cursor.row) - local maxrow = math.max(pre.cursor.row, new.cursor.row) + local minrow = math.min(ctx.cursor.row, new.cursor.row) + local maxrow = math.max(ctx.cursor.row, new.cursor.row) for _, te in ipairs(text_edits) do local srow = te.range.start.line + 1 local erow = te.range['end'].line + 1 @@ -338,10 +338,10 @@ core.confirm = function(self, e, option, callback) if has_cursor_line_text_edit then return end - vim.fn['cmp#apply_text_edits'](new.bufnr, text_edits) + vim.lsp.util.apply_text_edits(text_edits, ctx.bufnr) end) else - vim.fn['cmp#apply_text_edits'](vim.api.nvim_get_current_buf(), e:get_completion_item().additionalTextEdits) + vim.lsp.util.apply_text_edits(e:get_completion_item().additionalTextEdits, ctx.bufnr) end end) feedkeys.call('', 'n', function() @@ -371,7 +371,7 @@ core.confirm = function(self, e, option, callback) if is_snippet then completion_item.textEdit.newText = '' end - vim.fn['cmp#apply_text_edits'](ctx.bufnr, { completion_item.textEdit }) + vim.lsp.util.apply_text_edits({ completion_item.textEdit }, ctx.bufnr) local texts = vim.split(completion_item.textEdit.newText, '\n') local position = completion_item.textEdit.range.start position.line = position.line + (#texts - 1)