diff options
| -rw-r--r-- | .github/labeler.yml | 8 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp/diagnostic.lua | 8 | ||||
| -rw-r--r-- | src/nvim/macros.h | 2 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 6 |
4 files changed, 18 insertions, 6 deletions
diff --git a/.github/labeler.yml b/.github/labeler.yml index 100f97c5f2..8a7c0639f3 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -14,6 +14,9 @@ - runtime/lua/vim/treesitter.lua - runtime/lua/vim/treesitter/* +"dependencies": + - third-party/**/* + "topic: spell": - src/nvim/spell* @@ -39,3 +42,8 @@ "topic: diff": - src/nvim/diff.* + +"topic: build": + - CMakeLists.txt + - "**/CMakeLists.txt" + - "**/*.cmake" diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua index dabe400e0d..05b68472e7 100644 --- a/runtime/lua/vim/lsp/diagnostic.lua +++ b/runtime/lua/vim/lsp/diagnostic.lua @@ -271,8 +271,12 @@ local function set_diagnostic_cache(diagnostics, bufnr, client_id) end -- Account for servers that place diagnostics on terminating newline if buf_line_count > 0 then - local start = diagnostic.range.start - start.line = math.min(start.line, buf_line_count - 1) + diagnostic.range.start.line = math.min( + diagnostic.range.start.line, buf_line_count - 1 + ) + diagnostic.range["end"].line = math.min( + diagnostic.range["end"].line, buf_line_count - 1 + ) end end diff --git a/src/nvim/macros.h b/src/nvim/macros.h index eb9357d027..e718254fb9 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -169,7 +169,7 @@ #if NVIM_HAS_ATTRIBUTE(fallthrough) \ && (!defined(__apple_build_version__) || __apple_build_version__ >= 7000000) -# define FALLTHROUGH __attribute__((fallthrough)) +# define FALLTHROUGH {} __attribute__((fallthrough)) #else # define FALLTHROUGH #endif diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index e248232909..df7f1a0ac2 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -199,9 +199,9 @@ set(LIBICONV_SHA256 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc891 set(TREESITTER_C_URL https://github.com/tree-sitter/tree-sitter-c/archive/5aa0bbb.tar.gz) set(TREESITTER_C_SHA256 a5dcb37460d83002dfae7f9a208170ddbc9a047f231b9d6b75da7d36d707db2f) -# This is 0.19.4+2, fixes some segfaults https://github.com/tree-sitter/tree-sitter/commit/89e1157a299596f3ce2155ba9fd69d5e2c03d3e6 -set(TREESITTER_URL https://github.com/tree-sitter/tree-sitter/archive/89e1157a299596f3ce2155ba9fd69d5e2c03d3e6.zip) -set(TREESITTER_SHA256 d5be9fd92cbf783680f921b2adccbd721b9aa8b2c445114a216b6544330f252c) +# This is a bit after 0.19.5 because it fixes issues with queries +set(TREESITTER_URL https://github.com/tree-sitter/tree-sitter/archive/6ed42747a4e0faee9b65edbbacc86ed0caeae05c.zip) +set(TREESITTER_SHA256 07b8d090ae856d4ea8a494c08900271545d44af2558278a27693f9a47d9e75e3) if(USE_BUNDLED_UNIBILIUM) include(BuildUnibilium) |