Merge #15994 feat(:source, nvim_exec): script-local scope

2 files changed, 63 insertions, 2 deletions

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 6b644ed519..d8914a3ab7 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -91,6 +91,14 @@ describe('API', function()
       nvim('exec', 'set nowrap', false)
       eq('nowrap\n\tLast set from anonymous :source',
         nvim('exec', 'verbose set wrap?', true))
+
+      -- Using script var to force creation of a script item
+      nvim('exec', [[
+        let s:a = 1
+        set nowrap
+      ]], false)
+      eq('nowrap\n\tLast set from anonymous :source (script id 1)',
+        nvim('exec', 'verbose set wrap?', true))
     end)
 
     it('multiline input', function()
@@ -132,6 +140,43 @@ describe('API', function()
       -- try no spaces before continuations to catch off-by-one error
       nvim('exec', 'let ab = #{\n\\a: 98,\n"\\ b: 2\n\\}', false)
       eq({a = 98}, request('nvim_eval', 'g:ab'))
+
+      -- Script scope (s:)
+      eq('ahoy! script-scoped varrrrr', nvim('exec', [[
+          let s:pirate = 'script-scoped varrrrr'
+          function! s:avast_ye_hades(s) abort
+            return a:s .. ' ' .. s:pirate
+          endfunction
+          echo <sid>avast_ye_hades('ahoy!')
+        ]], true))
+
+      eq('ahoy! script-scoped varrrrr', nvim('exec', [[
+          let s:pirate = 'script-scoped varrrrr'
+          function! Avast_ye_hades(s) abort
+            return a:s .. ' ' .. s:pirate
+          endfunction
+          echo nvim_exec('echo Avast_ye_hades(''ahoy!'')', 1)
+        ]], true))
+
+      eq('Vim(call):E5555: API call: Vim(echo):E121: Undefined variable: s:pirate',
+        pcall_err(request, 'nvim_exec', [[
+          let s:pirate = 'script-scoped varrrrr'
+          call nvim_exec('echo s:pirate', 1)
+        ]], false))
+
+      -- Script items are created only on script var access
+      eq('1\n0', nvim('exec', [[
+          echo expand("<SID>")->empty()
+          let s:a = 123
+          echo expand("<SID>")->empty()
+        ]], true))
+
+      eq('1\n0', nvim('exec', [[
+          echo expand("<SID>")->empty()
+          function s:a() abort
+          endfunction
+          echo expand("<SID>")->empty()
+        ]], true))
     end)
 
     it('non-ASCII input', function()
diff --git a/test/functional/ex_cmds/source_spec.lua b/test/functional/ex_cmds/source_spec.lua
index bdf6ae76d1..fa650d611b 100644
--- a/test/functional/ex_cmds/source_spec.lua
+++ b/test/functional/ex_cmds/source_spec.lua
@@ -25,12 +25,19 @@ describe(':source', function()
       let b = #{
         \ k: "v"
        "\ (o_o)
-        \ }]])
+        \ }
+      let c = expand("<SID>")->empty()
+      let s:s = 0zbeef.cafe
+      let d = s:s]])
 
     command('source')
     eq('2', meths.exec('echo a', true))
     eq("{'k': 'v'}", meths.exec('echo b', true))
 
+    -- Script items are created only on script var access
+    eq("1", meths.exec('echo c', true))
+    eq("0zBEEFCAFE", meths.exec('echo d', true))
+
     exec('set cpoptions+=C')
     eq('Vim(let):E15: Invalid expression: #{', exc_exec('source'))
   end)
@@ -43,7 +50,11 @@ describe(':source', function()
       let b = #{
        "\ (>_<)
         \ K: "V"
-        \ }]])
+        \ }
+      function! s:C() abort
+        return expand("<SID>") .. "C()"
+      endfunction
+      let D = {-> s:C()}]])
 
     -- Source the 2nd line only
     feed('ggjV')
@@ -55,6 +66,11 @@ describe(':source', function()
     feed_command(':source')
     eq('4', meths.exec('echo a', true))
     eq("{'K': 'V'}", meths.exec('echo b', true))
+    eq("<SNR>1_C()", meths.exec('echo D()', true))
+
+    -- Source last line only
+    feed_command(':$source')
+    eq('Vim(echo):E117: Unknown function: s:C', exc_exec('echo D()'))
 
     exec('set cpoptions+=C')
     eq('Vim(let):E15: Invalid expression: #{', exc_exec("'<,'>source"))