diff options
Diffstat (limited to 'runtime/lua')
-rw-r--r-- | runtime/lua/vim/_defaults.lua | 2 | ||||
-rw-r--r-- | runtime/lua/vim/filetype/detect.lua | 2 | ||||
-rw-r--r-- | runtime/lua/vim/lsp.lua | 5 | ||||
-rw-r--r-- | runtime/lua/vim/lsp/buf.lua | 2 | ||||
-rw-r--r-- | runtime/lua/vim/treesitter/languagetree.lua | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua index 28f1542f64..69204e3fe6 100644 --- a/runtime/lua/vim/_defaults.lua +++ b/runtime/lua/vim/_defaults.lua @@ -652,7 +652,7 @@ do -- This autocommand updates the value of 'background' anytime we receive -- an OSC 11 response from the terminal emulator. If the user has set - -- 'background' explictly then we will delete this autocommand, + -- 'background' explicitly then we will delete this autocommand, -- effectively disabling automatic background setting. local force = false local id = vim.api.nvim_create_autocmd('TermResponse', { diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua index 91c0406dc0..fc0b45ecd8 100644 --- a/runtime/lua/vim/filetype/detect.lua +++ b/runtime/lua/vim/filetype/detect.lua @@ -34,7 +34,7 @@ local matchregex = vim.filetype._matchregex -- can be detected from the first five lines of the file. --- @type vim.filetype.mapfn function M.asm(path, bufnr) - -- tiasm uses `* commment` + -- tiasm uses `* comment` local lines = table.concat(getlines(bufnr, 1, 10), '\n') if findany(lines, { '^%*', '\n%*', 'Texas Instruments Incorporated' }) then return 'tiasm' diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 5226c8ae37..a45f9adeb6 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -1395,8 +1395,9 @@ end --- callback = function(args) --- local client = vim.lsp.get_client_by_id(args.data.client_id) --- if client:supports_method('textDocument/foldingRange') then ---- vim.wo.foldmethod = 'expr' ---- vim.wo.foldexpr = 'v:lua.vim.lsp.foldexpr()' +--- local win = vim.api.nvim_get_current_win() +--- vim.wo[win][0].foldmethod = 'expr' +--- vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()' --- end --- end, --- }) diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua index 638a0d0f3f..48aa809ebd 100644 --- a/runtime/lua/vim/lsp/buf.lua +++ b/runtime/lua/vim/lsp/buf.lua @@ -423,7 +423,7 @@ end --- ---@see vim.lsp.protocol.CompletionTriggerKind function M.completion(context) - vim.depends('vim.lsp.buf.completion', 'vim.lsp.commpletion.trigger', '0.12') + vim.depends('vim.lsp.buf.completion', 'vim.lsp.completion.trigger', '0.12') return lsp.buf_request( 0, ms.textDocument_completion, diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua index 8ea1c44cdc..1f7872715f 100644 --- a/runtime/lua/vim/treesitter/languagetree.lua +++ b/runtime/lua/vim/treesitter/languagetree.lua @@ -523,7 +523,7 @@ end --- only the root tree without injections). --- @param on_parse fun(err?: string, trees?: table<integer, TSTree>)? Function invoked when parsing completes. --- When provided and `vim.g._ts_force_sync_parsing` is not set, parsing will run ---- asynchronously. The first argument to the function is a string respresenting the error type, +--- asynchronously. The first argument to the function is a string representing the error type, --- in case of a failure (currently only possible for timeouts). The second argument is the list --- of trees returned by the parse (upon success), or `nil` if the parse timed out (determined --- by 'redrawtime'). |