aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1002: "gf" does not always work when URL has a port number

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 #4082)
This commit is contained in:
Bram Moolenaar 2019-03-09 12:32:56 +01:00
parent 8156ed3755
commit cbef8e1aa1
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/findfile.c
View File

@ -2017,10 +2017,10 @@ file_name_in_line(
len = 0;
while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
|| ((options & FNAME_HYP) && path_is_url(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
// http://google.com?q=this&that=ok works.
// After type:// we also include :, ?, & and = as valid characters, so that
// http://google.com:8080?q=this&that=ok works.
if ((ptr[len] >= 'A' && ptr[len] <= 'Z') || (ptr[len] >= 'a' && ptr[len] <= 'z'))
{
if (in_type && path_is_url(ptr + len + 1))

7
src/testdir/test_gf.vim
View File

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

2
src/version.c
View File

@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1002,
/**/
1001,
/**/