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.0.1426: "gf" and <cfile> don't accept ? and & in URL

Browse Source 
Problem:    "gf" and <cfile> don't accept ? and & in URL. (Dmitrii Tcyganok)
Solution:   Check for a URL and allow for extra characters. (closes vim/vim#2493)
9e3dfc6501
This commit is contained in:
Jan Edmund Lazo 2018-08-21 12:04:44 -04:00
parent 387c3be82a
commit 39777ad4b8
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,8 @@ func Test_gf_url()
\ "first test for URL://machine.name/tmp/vimtest2a and other text", \ "first test for URL://machine.name/tmp/vimtest2a and other text",
\ "second test for URL://machine.name/tmp/vimtest2b. And other text", \ "second test for URL://machine.name/tmp/vimtest2b. And other text",
\ "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",
\ ]) \ ])
call cursor(1,1) call cursor(1,1)
call search("^first") call search("^first")
@ -28,6 +29,10 @@ func Test_gf_url()
call search("URL") call search("URL")
call assert_equal("URL:\\\\machine.name\\tmp\\vimtest2d", expand("<cfile>")) call assert_equal("URL:\\\\machine.name\\tmp\\vimtest2d", expand("<cfile>"))
call search("^fifth")
call search("URL")
call assert_equal("URL://machine.name/tmp?q=vim&opt=yes", expand("<cfile>"))
set isf&vim set isf&vim
enew! enew!
endfunc endfunc

16
src/nvim/window.c
View File

@ -5112,6 +5112,8 @@ file_name_in_line (
{ {
char_u *ptr; char_u *ptr;
size_t len; size_t len;
bool in_type = true;
bool is_url = false;
/* /*
* search forward for what could be the start of a file name * search forward for what could be the start of a file name
@ -5147,7 +5149,19 @@ 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)) {
// After type:// we also include ?, & and = as valid characters, so that
// http://google.com?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)) {
is_url = true;
}
} else {
in_type = false;
}
if (ptr[len] == '\\' && ptr[len + 1] == ' ') { if (ptr[len] == '\\' && ptr[len + 1] == ' ') {
// Skip over the "\" in "\ ". // Skip over the "\" in "\ ".
++len; ++len;