Skip to content

Commit

Permalink
patch 8.1.1002: "gf" does not always work when URL has a port number
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
brammool committed Mar 9, 2019
1 parent 8156ed3 commit cbef8e1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/findfile.c
Expand Up @@ -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))
Expand Down
7 changes: 6 additions & 1 deletion src/testdir/test_gf.vim
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -779,6 +779,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1002,
/**/
1001,
/**/
Expand Down

0 comments on commit cbef8e1

Please sign in to comment.