mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 17:54:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #15803 fix(lsp_spec): tests depend on previous session

Browse Source
This commit is contained in:
Justin M. Keyes
2021-10-02 16:50:20 -07:00
committed by GitHub
parent 8c74c895b3 069d1de184
commit c5e8c39102
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/release.sh
View File

@@ -80,8 +80,8 @@ _do_release_commit() {
_do_bump_commit() { _do_bump_commit() {
$__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt $__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt
$__sed -i.bk 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt $__sed -i.bk 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt
rm CMakeLists.txt.bk rm -f CMakeLists.txt.bk
rm runtime/nvim.appdata.xml.bk rm -f runtime/nvim.appdata.xml.bk
nvim +'/NVIM_VERSION' +1new +'exe "norm! iUpdate version numbers!!!"' \ nvim +'/NVIM_VERSION' +1new +'exe "norm! iUpdate version numbers!!!"' \
-O CMakeLists.txt -O CMakeLists.txt

4
test/functional/plugin/lsp_spec.lua
View File

@@ -132,9 +132,9 @@ local function test_rpc_server(config)
end end
describe('LSP', function() describe('LSP', function()
describe('server_name specified', function()
before_each(function() before_each(function()
clear_notrace() clear_notrace()
-- Run an instance of nvim on the file which contains our "scripts". -- Run an instance of nvim on the file which contains our "scripts".
-- Pass TEST_NAME to pick the script. -- Pass TEST_NAME to pick the script.
local test_name = "basic_init" local test_name = "basic_init"
@@ -163,6 +163,7 @@ describe('LSP', function()
-- exec_lua("lsp.stop_all_clients(true)") -- exec_lua("lsp.stop_all_clients(true)")
end) end)
describe('server_name specified', function()
it('start_client(), stop_client()', function() it('start_client(), stop_client()', function()
retry(nil, 4000, function() retry(nil, 4000, function()
eq(1, exec_lua('return #lsp.get_active_clients()')) eq(1, exec_lua('return #lsp.get_active_clients()'))
@@ -334,7 +335,6 @@ describe('LSP', function()
} }
end) end)
it('workspace/configuration returns NIL per section if client was started without config.settings', function() it('workspace/configuration returns NIL per section if client was started without config.settings', function()
clear_notrace()
fake_lsp_server_setup('workspace/configuration no settings') fake_lsp_server_setup('workspace/configuration no settings')
eq({ NIL, NIL, }, exec_lua [[ eq({ NIL, NIL, }, exec_lua [[
local result = { local result = {