diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-09 22:53:51 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-03-10 04:53:51 +0100 |
| commit | 95ce1e5408c2b57dbe76468c10b85eae534f8997 (patch) | |
| tree | 0ebd9791932181bf9061c2ca5139387d52a61bc6 /src | |
| parent | 092e7e6c60588463389182a3babde9f4ee98bc1c (diff) | |
| download | rneovim-95ce1e5408c2b57dbe76468c10b85eae534f8997.tar.gz rneovim-95ce1e5408c2b57dbe76468c10b85eae534f8997.tar.bz2 rneovim-95ce1e5408c2b57dbe76468c10b85eae534f8997.zip | |
vim-patch:8.1.1002: "gf" on URL with port number #9705
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)
https://github.com/vim/vim/commit/cbef8e1aa1f260ffde16491b1678eae53a36cf68
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_gf.vim | 7 | ||||
| -rw-r--r-- | src/nvim/window.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_gf.vim b/src/nvim/testdir/test_gf.vim index c352379697..d233046d2b 100644 --- a/src/nvim/testdir/test_gf.vim +++ b/src/nvim/testdir/test_gf.vim @@ -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 diff --git a/src/nvim/window.c b/src/nvim/window.c index efdee34c10..83ddf534cf 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5710,9 +5710,9 @@ file_name_in_line ( len = 0; while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ') || ((options & FNAME_HYP) && path_is_url((char *)ptr + len)) - || (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. + || (is_url && vim_strchr((char_u *)":?&=", ptr[len]) != NULL)) { + // 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((char *)ptr + len + 1)) { |