mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-01 11:06:54 -04:00
refactor!: update to Neovim 0.7 APIs
* set highlight groups via nvim_set_hl * define autocommands via nvim_create_autocmd * port plugin/nvim-treesitter.vim to Lua * port healthcheck to Lua
This commit is contained in:
Christian Clason
Christian Clason
parent
bc25a6a5c4
commit
07eb437bb1
8 changed files with 168 additions and 148 deletions
121
plugin/nvim-treesitter.lua
Normal file
121
plugin/nvim-treesitter.lua
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
-- Last Change: 2022 Apr 16
|
||||
|
||||
if vim.g.loaded_nvim_treesitter then
|
||||
return
|
||||
end
|
||||
vim.g.loaded_nvim_treesitter = true
|
||||
|
||||
-- setup modules
|
||||
require("nvim-treesitter").setup()
|
||||
|
||||
local api = vim.api
|
||||
|
||||
-- define autocommands
|
||||
local augroup = api.nvim_create_augroup("NvimTreesitter", {})
|
||||
|
||||
api.nvim_create_autocmd("Filetype", {
|
||||
pattern = "query",
|
||||
group = augroup,
|
||||
callback = function()
|
||||
api.nvim_clear_autocmds {
|
||||
group = augroup,
|
||||
event = "BufWritePost",
|
||||
}
|
||||
api.nvim_create_autocmd("BufWritePost", {
|
||||
group = augroup,
|
||||
buffer = 0,
|
||||
callback = function(opts)
|
||||
require("nvim-treesitter.query").invalidate_query_file(opts.file)
|
||||
end,
|
||||
desc = "Invalidate query file",
|
||||
})
|
||||
end,
|
||||
desc = "Reload query",
|
||||
})
|
||||
|
||||
-- define highlights
|
||||
local highlights = {
|
||||
TSNone = { default = true },
|
||||
TSPunctDelimiter = { link = "Delimiter", default = true },
|
||||
TSPunctBracket = { link = "Delimiter", default = true },
|
||||
TSPunctSpecial = { link = "Delimiter", default = true },
|
||||
|
||||
TSConstant = { link = "Constant", default = true },
|
||||
TSConstBuiltin = { link = "Special", default = true },
|
||||
TSConstMacro = { link = "Define", default = true },
|
||||
TSString = { link = "String", default = true },
|
||||
TSStringRegex = { link = "String", default = true },
|
||||
TSStringEscape = { link = "SpecialChar", default = true },
|
||||
TSStringSpecial = { link = "SpecialChar", default = true },
|
||||
TSCharacter = { link = "Character", default = true },
|
||||
TSCharacterSpecial = { link = "SpecialChar", default = true },
|
||||
TSNumber = { link = "Number", default = true },
|
||||
TSBoolean = { link = "Boolean", default = true },
|
||||
TSFloat = { link = "Float", default = true },
|
||||
|
||||
TSFunction = { link = "Function", default = true },
|
||||
TSFuncBuiltin = { link = "Special", default = true },
|
||||
TSFuncMacro = { link = "Macro", default = true },
|
||||
TSParameter = { link = "Identifier", default = true },
|
||||
TSParameterReference = { link = "TSParameter", default = true },
|
||||
TSMethod = { link = "Function", default = true },
|
||||
TSField = { link = "Identifier", default = true },
|
||||
TSProperty = { link = "Identifier", default = true },
|
||||
TSConstructor = { link = "Special", default = true },
|
||||
TSAnnotation = { link = "PreProc", default = true },
|
||||
TSAttribute = { link = "PreProc", default = true },
|
||||
TSNamespace = { link = "Include", default = true },
|
||||
TSSymbol = { link = "Identifier", default = true },
|
||||
|
||||
TSConditional = { link = "Conditional", default = true },
|
||||
TSRepeat = { link = "Repeat", default = true },
|
||||
TSLabel = { link = "Label", default = true },
|
||||
TSOperator = { link = "Operator", default = true },
|
||||
TSKeyword = { link = "Keyword", default = true },
|
||||
TSKeywordFunction = { link = "Keyword", default = true },
|
||||
TSKeywordOperator = { link = "TSOperator", default = true },
|
||||
TSKeywordReturn = { link = "TSKeyword", default = true },
|
||||
TSException = { link = "Exception", default = true },
|
||||
TSDebug = { link = "Debug", default = true },
|
||||
TSDefine = { link = "Define", default = true },
|
||||
TSPreProc = { link = "PreProc", default = true },
|
||||
TSStorageClass = { link = "StorageClass", default = true },
|
||||
|
||||
TSTodo = { link = "Todo", default = true },
|
||||
|
||||
TSType = { link = "Type", default = true },
|
||||
TSTypeBuiltin = { link = "Type", default = true },
|
||||
TSTypeQualifier = { link = "Type", default = true },
|
||||
TSTypeDefinition = { link = "Typedef", default = true },
|
||||
|
||||
TSInclude = { link = "Include", default = true },
|
||||
|
||||
TSVariableBuiltin = { link = "Special", default = true },
|
||||
|
||||
TSText = { link = "TSNone", default = true },
|
||||
TSStrong = { bold = true, default = true },
|
||||
TSEmphasis = { italic = true, default = true },
|
||||
TSUnderline = { underline = true },
|
||||
TSStrike = { strikethrough = true },
|
||||
|
||||
TSMath = { link = "Special", default = true },
|
||||
TSTextReference = { link = "Constant", default = true },
|
||||
TSEnvironment = { link = "Macro", default = true },
|
||||
TSEnvironmentName = { link = "Type", default = true },
|
||||
TSTitle = { link = "Title", default = true },
|
||||
TSLiteral = { link = "String", default = true },
|
||||
TSURI = { link = "Underlined", default = true },
|
||||
|
||||
TSComment = { link = "Comment", default = true },
|
||||
TSNote = { link = "SpecialComment", default = true },
|
||||
TSWarning = { link = "Todo", default = true },
|
||||
TSDanger = { link = "WarningMsg", default = true },
|
||||
|
||||
TSTag = { link = "Label", default = true },
|
||||
TSTagDelimiter = { link = "Delimiter", default = true },
|
||||
TSTagAttribute = { link = "TSProperty", default = true },
|
||||
}
|
||||
|
||||
for k, v in pairs(highlights) do
|
||||
api.nvim_set_hl(0, k, v)
|
||||
end
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
" Last Change: 2020 Aug 13
|
||||
|
||||
if exists('g:loaded_nvim_treesitter')
|
||||
finish
|
||||
endif
|
||||
|
||||
augroup NvimTreesitter
|
||||
" on every query file write we want to set an autocommand that will reload the cache
|
||||
autocmd FileType query
|
||||
\ autocmd! NvimTreesitter BufWritePost <buffer> call v:lua.require('nvim-treesitter.query').invalidate_query_file(expand('%:p'))
|
||||
augroup END
|
||||
|
||||
let g:loaded_nvim_treesitter = 1
|
||||
|
||||
lua require'nvim-treesitter'.setup()
|
||||
|
||||
function s:has_attr(attr, mode)
|
||||
let norm_color = synIDattr(hlID('Normal'), a:attr, a:mode)
|
||||
return strlen(norm_color) > 0
|
||||
endfunction
|
||||
|
||||
" if the ctermfg or guifg is not known by nvim then using the
|
||||
" fg or foreground highlighting value will cause an E419 error
|
||||
" so we check to see if either highlight has been set if not default to NONE
|
||||
let cterm_normal = s:has_attr('fg', 'cterm') ? 'fg' : 'NONE'
|
||||
let gui_normal = s:has_attr('fg', 'gui') ? 'foreground' : 'NONE'
|
||||
|
||||
execute 'highlight default TSNone term=NONE cterm=NONE gui=NONE guifg='.gui_normal.' ctermfg='.cterm_normal
|
||||
|
||||
highlight default link TSPunctDelimiter Delimiter
|
||||
highlight default link TSPunctBracket Delimiter
|
||||
highlight default link TSPunctSpecial Delimiter
|
||||
|
||||
highlight default link TSConstant Constant
|
||||
highlight default link TSConstBuiltin Special
|
||||
highlight default link TSConstMacro Define
|
||||
highlight default link TSString String
|
||||
highlight default link TSStringRegex String
|
||||
highlight default link TSStringEscape SpecialChar
|
||||
highlight default link TSStringSpecial SpecialChar
|
||||
highlight default link TSCharacter Character
|
||||
highlight default link TSCharacterSpecial SpecialChar
|
||||
highlight default link TSNumber Number
|
||||
highlight default link TSBoolean Boolean
|
||||
highlight default link TSFloat Float
|
||||
|
||||
highlight default link TSFunction Function
|
||||
highlight default link TSFuncBuiltin Special
|
||||
highlight default link TSFuncMacro Macro
|
||||
highlight default link TSParameter Identifier
|
||||
highlight default link TSParameterReference TSParameter
|
||||
highlight default link TSMethod Function
|
||||
highlight default link TSField Identifier
|
||||
highlight default link TSProperty Identifier
|
||||
highlight default link TSConstructor Special
|
||||
highlight default link TSAnnotation PreProc
|
||||
highlight default link TSAttribute PreProc
|
||||
highlight default link TSNamespace Include
|
||||
highlight default link TSSymbol Identifier
|
||||
|
||||
highlight default link TSConditional Conditional
|
||||
highlight default link TSRepeat Repeat
|
||||
highlight default link TSLabel Label
|
||||
highlight default link TSOperator Operator
|
||||
highlight default link TSKeyword Keyword
|
||||
highlight default link TSKeywordFunction Keyword
|
||||
highlight default link TSKeywordOperator TSOperator
|
||||
highlight default link TSKeywordReturn TSKeyword
|
||||
highlight default link TSException Exception
|
||||
highlight default link TSDebug Debug
|
||||
highlight default link TSDefine Define
|
||||
highlight default link TSPreProc PreProc
|
||||
highlight default link TSStorageClass StorageClass
|
||||
|
||||
highlight default link TSTodo Todo
|
||||
|
||||
highlight default link TSType Type
|
||||
highlight default link TSTypeBuiltin Type
|
||||
highlight default link TSTypeQualifier Type
|
||||
highlight default link TSTypeDefinition Typedef
|
||||
|
||||
highlight default link TSInclude Include
|
||||
|
||||
highlight default link TSVariableBuiltin Special
|
||||
|
||||
highlight default link TSText TSNone
|
||||
highlight default TSStrong term=bold cterm=bold gui=bold
|
||||
highlight default TSEmphasis term=italic cterm=italic gui=italic
|
||||
highlight default TSUnderline term=underline cterm=underline gui=underline
|
||||
highlight default TSStrike term=strikethrough cterm=strikethrough gui=strikethrough
|
||||
highlight default link TSMath Special
|
||||
highlight default link TSTextReference Constant
|
||||
highlight default link TSEnvironment Macro
|
||||
highlight default link TSEnvironmentName Type
|
||||
highlight default link TSTitle Title
|
||||
highlight default link TSLiteral String
|
||||
highlight default link TSURI Underlined
|
||||
|
||||
highlight default link TSComment Comment
|
||||
highlight default link TSNote SpecialComment
|
||||
highlight default link TSWarning Todo
|
||||
highlight default link TSDanger WarningMsg
|
||||
|
||||
highlight default link TSTag Label
|
||||
highlight default link TSTagDelimiter Delimiter
|
||||
highlight default link TSTagAttribute TSProperty
|
||||
Loading…
Add table
Add a link
Reference in a new issue