From 9e3dfc650190e96739abc004eb9948afa68136b4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 25 Dec 2017 14:29:18 +0100
Subject: [PATCH] patch 8.0.1426: "gf" and <cfile> don't accept ? and & in URL
Problem: "gf" and <cfile> don't accept ? and & in URL. (Dmitrii Tcyganok)
Solution: Check for a URL and allow for extra characters. (closes #2493)
---
src/testdir/test_gf.vim | 7 ++++++-
src/version.c | 2 ++
src/window.c | 16 ++++++++++++++--
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim
index ef1bf1075..c35237969 100644
--- a/src/testdir/test_gf.vim
+++ b/src/testdir/test_gf.vim
@@ -7,7 +7,8 @@ func Test_gf_url()
\ "first test for URL://machine.name/tmp/vimtest2a and other text",
\ "second test for URL://machine.name/tmp/vimtest2b. 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 search("^first")
@@ -28,6 +29,10 @@ func Test_gf_url()
call search("URL")
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
enew!
endfunc
diff --git a/src/version.c b/src/version.c
index f62287b5b..17547222f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1426,
/**/
1425,
/**/
diff --git a/src/window.c b/src/window.c
index ffe4e38f8..a58fbbd7b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6081,7 +6081,6 @@ grab_file_name(long count, linenr_T *file_lnum)
count, curbuf->b_ffname);
}
return file_name_at_cursor(options | FNAME_HYP, count, file_lnum);
-
}
/*
@@ -6120,6 +6119,8 @@ file_name_in_line(
{
char_u *ptr;
int len;
+ int in_type = TRUE;
+ int is_url = FALSE;
/*
* search forward for what could be the start of a file name
@@ -6158,8 +6159,19 @@ file_name_in_line(
*/
len = 0;
while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
- || ((options & FNAME_HYP) && path_is_url(ptr + len)))
+ || ((options & FNAME_HYP) && path_is_url(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(ptr + len + 1))
+ is_url = TRUE;
+ }
+ else
+ in_type = FALSE;
+
if (ptr[len] == '\\')
/* Skip over the "\" in "\ ". */
++len;
--
2.40.0