Replace old highlighting with treesitter
This commit is contained in:
parent
dc7e15ec4c
commit
b257072be5
5 changed files with 48 additions and 12 deletions
|
@ -21,3 +21,7 @@
|
||||||
smtpserverport = 587
|
smtpserverport = 587
|
||||||
[credential]
|
[credential]
|
||||||
helper = store
|
helper = store
|
||||||
|
[color]
|
||||||
|
ui = true
|
||||||
|
[diff]
|
||||||
|
wsErrorHighlight = all
|
||||||
|
|
|
@ -4,6 +4,7 @@ source $HOME/.config/nvim/coq.vim
|
||||||
source $HOME/.config/nvim/plug/plug.vim
|
source $HOME/.config/nvim/plug/plug.vim
|
||||||
source $HOME/.config/nvim/plugs.vim
|
source $HOME/.config/nvim/plugs.vim
|
||||||
|
|
||||||
|
source $HOME/.config/nvim/treesitter.lua
|
||||||
source $HOME/.config/nvim/rust.lua
|
source $HOME/.config/nvim/rust.lua
|
||||||
source $HOME/.config/nvim/completion.lua
|
source $HOME/.config/nvim/completion.lua
|
||||||
|
|
||||||
|
@ -54,6 +55,3 @@ au BufRead,BufNewFile *.tla setf tla
|
||||||
|
|
||||||
" I like pretty things
|
" I like pretty things
|
||||||
source $HOME/.config/nvim/colors.vim
|
source $HOME/.config/nvim/colors.vim
|
||||||
|
|
||||||
" Conceal markdown syntax
|
|
||||||
set conceallevel=2
|
|
||||||
|
|
|
@ -15,16 +15,10 @@ Plug 'tpope/vim-obsession'
|
||||||
Plug 'tpope/vim-fugitive' " whose fault is it
|
Plug 'tpope/vim-fugitive' " whose fault is it
|
||||||
|
|
||||||
" Language support
|
" Language support
|
||||||
Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting for many languages
|
Plug 'nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }
|
||||||
Plug 'ntietz/tla.vim'
|
Plug 'ntietz/tla.vim'
|
||||||
Plug 'fatih/vim-go'
|
Plug 'fatih/vim-go'
|
||||||
|
|
||||||
" Markdown suppoert
|
|
||||||
Plug 'godlygeek/tabular'
|
|
||||||
Plug 'preservim/vim-markdown'
|
|
||||||
let g:vim_markdown_folding_disabled = 1
|
|
||||||
let g:vim_markdown_strikethrough = 1
|
|
||||||
|
|
||||||
" Use common config to setup tab depth
|
" Use common config to setup tab depth
|
||||||
Plug 'editorconfig/editorconfig-vim'
|
Plug 'editorconfig/editorconfig-vim'
|
||||||
|
|
||||||
|
|
42
nvim/.config/nvim/treesitter.lua
Normal file
42
nvim/.config/nvim/treesitter.lua
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
require'nvim-treesitter.configs'.setup {
|
||||||
|
-- A list of parser names, or "all"
|
||||||
|
ensure_installed = { "markdown", "markdown_inline", "go", "python" },
|
||||||
|
|
||||||
|
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||||
|
sync_install = false,
|
||||||
|
|
||||||
|
-- Automatically install missing parsers when entering buffer
|
||||||
|
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
|
||||||
|
auto_install = true,
|
||||||
|
|
||||||
|
-- List of parsers to ignore installing (for "all")
|
||||||
|
ignore_install = { "rust" },
|
||||||
|
|
||||||
|
---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
|
||||||
|
-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
|
||||||
|
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
|
||||||
|
-- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
|
||||||
|
-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
|
||||||
|
-- the name of the parser)
|
||||||
|
-- list of language that will be disabled
|
||||||
|
disable = { "rust" },
|
||||||
|
|
||||||
|
-- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
|
||||||
|
disable = function(lang, buf)
|
||||||
|
local max_filesize = 100 * 1024 -- 100 KB
|
||||||
|
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||||
|
if ok and stats and stats.size > max_filesize then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
|
||||||
|
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||||
|
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||||
|
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||||
|
-- Instead of true it can also be a list of languages
|
||||||
|
additional_vim_regex_highlighting = false,
|
||||||
|
},
|
||||||
|
}
|
|
@ -49,5 +49,3 @@ windows:
|
||||||
- clear
|
- clear
|
||||||
- editor:
|
- editor:
|
||||||
- vim-resume
|
- vim-resume
|
||||||
- watcher:
|
|
||||||
- bacon
|
|
||||||
|
|
Loading…
Reference in a new issue