diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/pattern.txt | 3 | ||||
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | runtime/ftplugin/man.vim | 1 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp/util.lua | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index adfab07758..7129c6cd58 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1111,6 +1111,9 @@ x A single character, with no special meaning, matches itself *[:tab:]* [:tab:] the <Tab> character *[:escape:]* [:escape:] the <Esc> character *[:backspace:]* [:backspace:] the <BS> character +*[:ident:]* [:ident:] identifier character (same as "\i") +*[:keyword:]* [:keyword:] keyword character (same as "\k") +*[:fname:]* [:fname:] file name character (same as "\f") The brackets in character class expressions are additional to the brackets delimiting a collection. For example, the following is a plausible pattern for a Unix filename: "[-./[:alnum:]_~]\+" That is, diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6807bef3eb..c0d656107c 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -84,6 +84,9 @@ au BufNewFile,BufRead *.gpr setf ada " AHDL au BufNewFile,BufRead *.tdf setf ahdl +" AIDL +au BufNewFile,BufRead *.aidl setf aidl + " AMPL au BufNewFile,BufRead *.run setf ampl diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 0416e41368..74225a558c 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -16,6 +16,7 @@ setlocal noswapfile buftype=nofile bufhidden=hide setlocal nomodified readonly nomodifiable setlocal noexpandtab tabstop=8 softtabstop=8 shiftwidth=8 setlocal wrap breakindent linebreak +setlocal iskeyword+=- setlocal nonumber norelativenumber setlocal foldcolumn=0 colorcolumn=0 nolist nofoldenable diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index 5a68138f1e..33fca29ecd 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -92,7 +92,7 @@ local function sort_by_key(fn) end end local edit_sort_key = sort_by_key(function(e) - return {e.A[1], e.A[2], -e.i} + return {e.A[1], e.A[2], e.i} end) --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position @@ -195,12 +195,6 @@ function M.apply_text_document_edit(text_document_edit) M.apply_text_edits(text_document_edit.edits, bufnr) end -function M.get_current_line_to_cursor() - local pos = api.nvim_win_get_cursor(0) - local line = assert(api.nvim_buf_get_lines(0, pos[1]-1, pos[1], false)[1]) - return line:sub(pos[2]+1) -end - local function parse_snippet_rec(input, inner) local res = "" |