diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-09-04 17:58:33 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2022-09-06 07:57:46 +0200 |
| commit | 97f38f0a9bbae4969f672746a62caa6cba136b45 (patch) | |
| tree | febc4ff84233816863be27ab6229a0c43fc526bd | |
| parent | 64cc78c9f39b3066b74f01ec7e3f50fd316416e4 (diff) | |
| download | rneovim-97f38f0a9bbae4969f672746a62caa6cba136b45.tar.gz rneovim-97f38f0a9bbae4969f672746a62caa6cba136b45.tar.bz2 rneovim-97f38f0a9bbae4969f672746a62caa6cba136b45.zip | |
fix(treesitter): do not link @error by default
The @error capture is used for tree-sitter's ERROR node, which indicates
a parsing error -- which can be quite frequent (and jarring) while typing.
Users can still manually `hi link @error Error` in their config.
| -rw-r--r-- | cmake.deps/cmake/BuildTreesitterParsers.cmake | 5 | ||||
| -rw-r--r-- | src/nvim/highlight_group.c | 1 | ||||
| -rw-r--r-- | test/functional/treesitter/highlight_spec.lua | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/cmake.deps/cmake/BuildTreesitterParsers.cmake b/cmake.deps/cmake/BuildTreesitterParsers.cmake index 6267a1387c..dd3f4eb308 100644 --- a/cmake.deps/cmake/BuildTreesitterParsers.cmake +++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake @@ -16,12 +16,7 @@ function(BuildTSParser LANG TS_URL TS_SHA256 TS_CMAKE_FILE) ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TS_CMAKE_FILE} ${DEPS_BUILD_DIR}/src/${NAME}/CMakeLists.txt CMAKE_ARGS - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_GENERATOR=${CMAKE_GENERATOR} - ${BUILD_TYPE_STRING} -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} - # Pass toolchain - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DPARSERLANG=${LANG}) endfunction() diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c index 5c07784db3..412fe3509d 100644 --- a/src/nvim/highlight_group.c +++ b/src/nvim/highlight_group.c @@ -186,7 +186,6 @@ static const char *highlight_init_both[] = { "default link DiagnosticSignInfo DiagnosticInfo", "default link DiagnosticSignHint DiagnosticHint", - "default link @error Error", "default link @text.underline Underlined", "default link @todo Todo", "default link @debug Debug", diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua index 5e38a8c2df..d557b2c012 100644 --- a/test/functional/treesitter/highlight_spec.lua +++ b/test/functional/treesitter/highlight_spec.lua @@ -106,6 +106,7 @@ describe('treesitter highlighting', function() } exec_lua([[ hl_query = ... ]], hl_query) + command [[ hi link @error ErrorMsg ]] command [[ hi link @warning WarningMsg ]] end) |