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

vim-patch:8.1.1002: "gf" on URL with port number #9705

Browse Source 
Problem:    "gf" does not always work when URL has a port number. (Jakob
            Schöttl)
Solution:   When a URL is recognized also accept ":". (closes vim/vim#4082)
cbef8e1aa1
This commit is contained in:
Jan Edmund Lazo 2019-03-09 22:53:51 -05:00 committed by Justin M. Keyes
parent 092e7e6c60
commit 95ce1e5408
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/testdir/test_gf.vim
View File

@ -9,6 +9,7 @@ func Test_gf_url()
\ "third test for URL:\\\\machine.name\\vimtest2c and other text", \ "third test for URL:\\\\machine.name\\vimtest2c and other text",
\ "fourth test for URL:\\\\machine.name\\tmp\\vimtest2d, and other text", \ "fourth test for URL:\\\\machine.name\\tmp\\vimtest2d, and other text",
\ "fifth test for URL://machine.name/tmp?q=vim&opt=yes and other text", \ "fifth test for URL://machine.name/tmp?q=vim&opt=yes and other text",
\ "sixth test for URL://machine.name:1234?q=vim and other text",
\ ]) \ ])
call cursor(1,1) call cursor(1,1)
call search("^first") call search("^first")
@ -20,7 +21,7 @@ func Test_gf_url()
if has("ebcdic") if has("ebcdic")
set isf=@,240-249,/,.,-,_,+,,,$,:,~,\ set isf=@,240-249,/,.,-,_,+,,,$,:,~,\
else else
set isf=@,48-57,/,.,-,_,+,,,$,:,~,\ set isf=@,48-57,/,.,-,_,+,,,$,~,\
endif endif
call search("^third") call search("^third")
call search("name") call search("name")
@ -33,6 +34,10 @@ func Test_gf_url()
call search("URL") call search("URL")
call assert_equal("URL://machine.name/tmp?q=vim&opt=yes", expand("<cfile>")) call assert_equal("URL://machine.name/tmp?q=vim&opt=yes", expand("<cfile>"))
call search("^sixth")
call search("URL")
call assert_equal("URL://machine.name:1234?q=vim", expand("<cfile>"))
set isf&vim set isf&vim
enew! enew!
endfunc endfunc

6
src/nvim/window.c
View File

@ -5710,9 +5710,9 @@ file_name_in_line (
len = 0; len = 0;
while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ') while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
|| ((options & FNAME_HYP) && path_is_url((char *)ptr + len)) || ((options & FNAME_HYP) && path_is_url((char *)ptr + len))
|| (is_url && vim_strchr((char_u *)"?&=", ptr[len]) != NULL)) { || (is_url && vim_strchr((char_u *)":?&=", ptr[len]) != NULL)) {
// After type:// we also include ?, & and = as valid characters, so that // After type:// we also include :, ?, & and = as valid characters, so that
// http://google.com?q=this&that=ok works. // http://google.com:8080?q=this&that=ok works.
if ((ptr[len] >= 'A' && ptr[len] <= 'Z') if ((ptr[len] >= 'A' && ptr[len] <= 'Z')
|| (ptr[len] >= 'a' && ptr[len] <= 'z')) { || (ptr[len] >= 'a' && ptr[len] <= 'z')) {
if (in_type && path_is_url((char *)ptr + len + 1)) { if (in_type && path_is_url((char *)ptr + len + 1)) {