mirror of https://github.com/neovim/neovim.git
Compare commits
3 Commits
caba5824cd
...
a410f1f24b
Author | SHA1 | Date |
---|---|---|
Tim Pope | a410f1f24b | |
dundargoc | c18d7941ef | |
Tim Pope | 4541189052 |
|
@ -50,11 +50,6 @@ file(GLOB DOCFILES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/runtime/doc/*.txt)
|
|||
set_directory_properties(PROPERTIES
|
||||
EP_PREFIX "${DEPS_BUILD_DIR}")
|
||||
|
||||
find_program(CCACHE_PRG ccache)
|
||||
if(CCACHE_PRG)
|
||||
set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CCACHE_PRG})
|
||||
endif()
|
||||
|
||||
if(NOT CI_BUILD)
|
||||
set(CMAKE_INSTALL_MESSAGE NEVER)
|
||||
endif()
|
||||
|
|
|
@ -23,6 +23,12 @@ if(POLICY CMP0092)
|
|||
list(APPEND DEPS_CMAKE_ARGS -D CMAKE_POLICY_DEFAULT_CMP0092=NEW)
|
||||
endif()
|
||||
|
||||
find_program(CACHE_PRG NAMES ccache sccache)
|
||||
if(CACHE_PRG)
|
||||
set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CACHE_PRG})
|
||||
list(APPEND DEPS_CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER})
|
||||
endif()
|
||||
|
||||
# MAKE_PRG
|
||||
if(UNIX)
|
||||
find_program(MAKE_PRG NAMES gmake make)
|
||||
|
@ -58,7 +64,8 @@ function(get_externalproject_options name DEPS_IGNORE_SHA)
|
|||
|
||||
set(EXTERNALPROJECT_OPTIONS
|
||||
DOWNLOAD_NO_PROGRESS TRUE
|
||||
EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL})
|
||||
EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL}
|
||||
CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
|
||||
|
||||
if(NOT ${DEPS_IGNORE_SHA})
|
||||
list(APPEND EXTERNALPROJECT_OPTIONS URL_HASH SHA256=${${name_allcaps}_SHA256})
|
||||
|
|
|
@ -209,6 +209,9 @@ M[ms.workspace_configuration] = function(_, result, ctx)
|
|||
value = vim.NIL
|
||||
end
|
||||
table.insert(response, value)
|
||||
else
|
||||
-- If no section is provided, return settings as is
|
||||
table.insert(response, client.settings)
|
||||
end
|
||||
end
|
||||
return response
|
||||
|
|
|
@ -150,9 +150,16 @@ function tests.check_workspace_configuration()
|
|||
{ section = 'testSetting2' },
|
||||
{ section = 'test.Setting3' },
|
||||
{ section = 'test.Setting4' },
|
||||
{},
|
||||
{ section = '' },
|
||||
},
|
||||
})
|
||||
expect_notification('workspace/configuration', { true, false, 'nested', vim.NIL })
|
||||
local all = {
|
||||
testSetting1 = true,
|
||||
testSetting2 = false,
|
||||
test = { Setting3 = 'nested' },
|
||||
}
|
||||
expect_notification('workspace/configuration', { true, false, 'nested', vim.NIL, all, all })
|
||||
notify('shutdown')
|
||||
end,
|
||||
}
|
||||
|
|
|
@ -504,6 +504,8 @@ describe('LSP', function()
|
|||
{ section = 'testSetting2' },
|
||||
{ section = 'test.Setting3' },
|
||||
{ section = 'test.Setting4' },
|
||||
{},
|
||||
{ section = '' },
|
||||
},
|
||||
},
|
||||
{ method = 'workspace/configuration', client_id = 1 },
|
||||
|
|
Loading…
Reference in New Issue