fix(eval): v:lua support for - in module names

bb010g · bfredl · commit fb8cd340dcd1 · 2022-01-28T18:20:26.000+01:00
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
@@ -8956,7 +8956,7 @@ static bool tv_is_luafunc(typval_T *tv)
 const char *skip_luafunc_name(const char *p)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  while (ASCII_ISALNUM(*p) || *p == '_' || *p == '.' || *p == '\'') {
+  while (ASCII_ISALNUM(*p) || *p == '_' || *p == '-' || *p == '.' || *p == '\'') {
     p++;
   }
   return p;
diff --git a/test/functional/fixtures/pack/foo/start/bar/lua/baz-quux.lua b/test/functional/fixtures/pack/foo/start/bar/lua/baz-quux.lua
@@ -0,0 +1 @@
+return {doit=function() return 9004 end}
diff --git a/test/functional/lua/luaeval_spec.lua b/test/functional/lua/luaeval_spec.lua
@@ -532,6 +532,7 @@ describe('v:lua', function()
     command('set pp+=test/functional/fixtures')
     eq('\tbadval', eval("v:lua.require'leftpad'('badval')"))
     eq(9003, eval("v:lua.require'bar'.doit()"))
+    eq(9004, eval("v:lua.require'baz-quux'.doit()"))
   end)
 
   it('throw errors for invalid use', function()

Original file line number	Diff line number	Diff line change
`@@ -8956,7 +8956,7 @@ static bool tv_is_luafunc(typval_T *tv)`
`8956`	`8956`	`const char skip_luafunc_name(const char p)`
`8957`	`8957`	`FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT`
`8958`	`8958`	`{`
`8959`		`- while (ASCII_ISALNUM(p) \|\| p == '_' \|\| p == '.' \|\| p == '\'') {`
	`8959`	`+ while (ASCII_ISALNUM(p) \|\| p == '_' \|\| p == '-' \|\| p == '.' \|\| *p == '\'') {`
`8960`	`8960`	`p++;`
`8961`	`8961`	`}`
`8962`	`8962`	`return p;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+return {doit=function() return 9004 end}`