IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #24392 from mrshmllow/gx_win

Browse Source 
fix(ui.open): some URLs fail on Windows
This commit is contained in:
Justin M. Keyes 2023-07-21 06:37:34 -07:00 committed by GitHub
commit 02d859a073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/lua/vim/ui.lua
View File

@ -136,7 +136,11 @@ function M.open(path)
if vim.fn.has('mac') == 1 then if vim.fn.has('mac') == 1 then
cmd = { 'open', path } cmd = { 'open', path }
elseif vim.fn.has('win32') == 1 then elseif vim.fn.has('win32') == 1 then
cmd = { 'explorer', path } if vim.fn.executable('rundll32') == 1 then
cmd = { 'rundll32', 'url.dll,FileProtocolHandler', path }
else
return nil, 'vim.ui.open: rundll32 not found'
end
elseif vim.fn.executable('wslview') == 1 then elseif vim.fn.executable('wslview') == 1 then
cmd = { 'wslview', path } cmd = { 'wslview', path }
elseif vim.fn.executable('xdg-open') == 1 then elseif vim.fn.executable('xdg-open') == 1 then

8
test/functional/lua/ui_spec.lua
View File

@ -6,6 +6,7 @@ local clear = helpers.clear
local feed = helpers.feed local feed = helpers.feed
local eval = helpers.eval local eval = helpers.eval
local is_ci = helpers.is_ci local is_ci = helpers.is_ci
local is_os = helpers.is_os
local poke_eventloop = helpers.poke_eventloop local poke_eventloop = helpers.poke_eventloop
describe('vim.ui', function() describe('vim.ui', function()
@ -134,8 +135,11 @@ describe('vim.ui', function()
describe('open()', function() describe('open()', function()
it('validation', function() it('validation', function()
if is_ci('github') then if is_os('win') or not is_ci('github') then
matches('vim.ui.open: command failed %(%d%): { "[^"]+", "non%-existent%-file" }', exec_lua[[vim.system = function() return { wait=function() return { code=3} end } end]]
end
if not is_os('bsd') then
matches('vim.ui.open: command failed %(%d%): { "[^"]+", .*"non%-existent%-file" }',
exec_lua[[local _, err = vim.ui.open('non-existent-file') ; return err]]) exec_lua[[local _, err = vim.ui.open('non-existent-file') ; return err]])
end end