From: Shane-XB-Qian <shane.qian@foxmail.com>
Date: Wed, 13 Aug 2025 20:31:09 +0000 (+0200)
Subject: runtime(vimgoto): make gf extract packadd/colo name more flexible
X-Git-Tag: v9.1.1629~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd9ed09d8eb54fe3328bfdf385a0c978f308eccd;p=thirdparty%2Fvim.git

runtime(vimgoto): make gf extract packadd/colo name more flexible

closes: #17983

Signed-off-by: Shane-XB-Qian <shane.qian@foxmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/runtime/autoload/vimgoto.vim b/runtime/autoload/vimgoto.vim
index b34dcc1a13..ffeab0af4b 100644
--- a/runtime/autoload/vimgoto.vim
+++ b/runtime/autoload/vimgoto.vim
@@ -3,7 +3,7 @@ vim9script
 # Language:     Vim9 script
 # Contributers: @lacygoill
 #               Shane-XB-Qian
-# Last Change:  2025 Aug 12
+# Last Change:  2025 Aug 13
 #
 # Vim Script to handle
 # :import, :packadd and :colorscheme
@@ -39,7 +39,7 @@ enddef
 #}}}1
 # Core {{{1
 def HandlePackaddLine(editcmd: string, curline: string) #{{{2
-    var pat: string = '^\s*\%(:\s*\)\=packadd!\=\s\+\zs\S\+$'
+    var pat: string = '\s*\%(:\s*\)\=packadd!\=\s\+\zs\S\+\>\ze'
     var plugin: string = curline
         ->matchstr(pat)
         ->substitute('^vim-\|\.vim$', '', 'g')
@@ -65,7 +65,7 @@ def HandlePackaddLine(editcmd: string, curline: string) #{{{2
 enddef
 
 def HandleColoLine(editcmd: string, curline: string) #{{{2
-    var pat: string = '^\s*\%(:\s*\)\=colo\%[rscheme]\s\+\zs\S\+$'
+    var pat: string = '\s*\%(:\s*\)\=colo\%[rscheme]\s\+\zs\S\+\>\ze'
     var colo: string = curline->matchstr(pat)
 
     if colo == ''