Skip to content

Commit 12be48e

Browse files
authored
Merge branch 'nvim-lua:master' into master
2 parents 0190285 + db78c0b commit 12be48e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ External Requirements:
2626
- Clipboard tool (xclip/xsel/win32yank or other depending on the platform)
2727
- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
2828
- if you have it set `vim.g.have_nerd_font` in `init.lua` to true
29+
- Emoji fonts (Ubuntu only, and only if you want emoji!) `sudo apt install fonts-noto-color-emoji`
2930
- Language Setup:
3031
- If you want to write Typescript, you need `npm`
3132
- If you want to write Golang, you will need `go`

init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ require('lazy').setup({
481481
--
482482
-- When you move your cursor, the highlights will be cleared (the second autocommand).
483483
local client = vim.lsp.get_client_by_id(event.data.client_id)
484-
if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
484+
if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
485485
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
486486
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
487487
buffer = event.buf,
@@ -508,7 +508,7 @@ require('lazy').setup({
508508
-- code, if the language server you are using supports them
509509
--
510510
-- This may be unwanted, since they displace some of your code
511-
if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
511+
if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
512512
map('<leader>th', function()
513513
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
514514
end, '[T]oggle Inlay [H]ints')

0 commit comments

Comments
 (0)