aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/lua/vim/lsp/protocol.lua10
-rw-r--r--src/nvim/CMakeLists.txt8
2 files changed, 8 insertions, 10 deletions
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 35eb0305d7..82e8c4a7de 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -1,6 +1,6 @@
--- Protocol for the Microsoft Language Server Protocol (mslsp)
+--- @diagnostic disable: duplicate-doc-alias
-local protocol = {}
+-- Protocol for the Microsoft Language Server Protocol (mslsp)
--[=[
---@private
@@ -20,7 +20,7 @@ function transform_schema_to_table()
end
--]=]
-local constants = {
+local protocol = {
--- @enum lsp.DiagnosticSeverity
DiagnosticSeverity = {
-- Reports an error.
@@ -313,7 +313,7 @@ local constants = {
},
}
-for k, v in pairs(constants) do
+for k, v in pairs(protocol) do
local tbl = vim.deepcopy(v, true)
vim.tbl_add_reverse_lookup(tbl)
protocol[k] = tbl
@@ -723,7 +723,7 @@ function protocol.make_client_capabilities()
codeActionLiteralSupport = {
codeActionKind = {
valueSet = (function()
- local res = vim.tbl_values(constants.CodeActionKind)
+ local res = vim.tbl_values(protocol.CodeActionKind)
table.sort(res)
return res
end)(),
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index f393993894..54ad43e8f3 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -121,11 +121,9 @@ elseif(MINGW)
# Enable wmain
target_link_libraries(nvim_bin PRIVATE -municode)
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- if(CMAKE_C_COMPILER_VERSION VERSION_LESS 10)
- target_compile_options(main_lib INTERFACE -Wno-conversion)
- endif()
-
- target_compile_options(main_lib INTERFACE -fno-common
+ target_compile_options(main_lib INTERFACE
+ -Wno-conversion
+ -fno-common
$<$<CONFIG:Release>:-Wno-unused-result>
$<$<CONFIG:RelWithDebInfo>:-Wno-unused-result>
$<$<CONFIG:MinSizeRel>:-Wno-unused-result>)