fixup: make sure to use the hoisted vars and decls

Author: tjdevries

crates/vim9-gen/src/lib.rs

@@ -591,12 +591,23 @@ impl Generate for UserCommand {
     }
 }
 
+fn get_local(state: &State, name: &Identifier) -> String {
+    if state.is_top_level() || !name.is_valid_local() {
+        ""
+    } else {
+        "local"
+    }
+    .to_string()
+}
+
 impl Generate for DeclCommand {
     fn write_default(&self, state: &mut State, output: &mut Output) {
+        let local = get_local(state, &self.name);
+
         // TODO: default value should not be nil for everything here
         // i think?
         output.write_lua(&format!(
-            "local {} = {}",
+            "{local} {} = {}",
             self.name.gen(state),
             match &self.ty {
                 Some(ty) => match ty {
@@ -730,12 +741,7 @@ impl Generate for DefCommand {
 
         let (signature, sig_statements) = gen_signature(state, &self.args);
 
-        let local = if state.is_top_level() || !self.name.is_valid_local() {
-            ""
-        } else {
-            "local"
-        };
-
+        let local = get_local(state, &self.name);
         let result = if scope.deferred > 0 {
             // TODO: Should probably handle errors in default statements or body
             format!(
@@ -1120,12 +1126,13 @@ impl Generate for VarCommand {
             _ => self.expr.gen(state),
         };
 
+        let local = get_local(state, &self.name);
         match &self.name {
             Identifier::Unpacked(unpacked) => {
                 let identifiers: String = identifier_list(state, &unpacked);
-                output.write_lua(&format!("local {identifiers} = unpack({expr})"))
+                output.write_lua(&format!("{local} {identifiers} = unpack({expr})"))
             }
-            _ => output.write_lua(&format!("local {} = {}", self.name.gen(state), expr)),
+            _ => output.write_lua(&format!("{local} {} = {}", self.name.gen(state), expr)),
         }
     }
 }
@@ -1601,7 +1608,7 @@ fn toplevel_ident(s: &mut State, command: &ExCommand) -> Option<String> {
         ExCommand::ExportCommand(e) => toplevel_ident(s, e.command.as_ref()),
         ExCommand::Heredoc(here) => Some(here.name.gen(s)),
         // This might make sense, but I don't think it allows you to do this?
-        ExCommand::Var(_) => None,
+        ExCommand::Var(var) => Some(var.name.gen(s)),
         // These make sense
         ExCommand::Vim9Script(_) => None,
         ExCommand::Echo(_) => None,

crates/vim9-gen/testdata/output/busted_indexing.lua

@@ -4,10 +4,11 @@
 ----------------------------------------
 
 local NVIM9 = require('_vim9script')
+local l = nil
 describe('filename', function()
   -- vim9script
 
-  local l = { 1, 2, 3 }
+  l = { 1, 2, 3 }
 
   it('Test_can_index', function()
     -- Set errors to empty

crates/vim9-gen/testdata/output/vim9_gen__test__autocmd.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1836
+assertion_line: 1843
 expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
 ---
 ----------------------------------------
@@ -10,6 +10,7 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 
 local NVIM9 = require('_vim9script')
 local __VIM9_MODULE = {}
+local x = nil
 -- vim9script
 
 vim.api.nvim_create_augroup('matchparen', { clear = false })
@@ -28,6 +29,6 @@ vim.api.nvim_create_autocmd({ 'WinLeave' }, {
   end,
 })
 
-local x = NVIM9.fn['len'](vim.api['nvim_get_autocmds']({ ['group'] = 'matchparen' }))
+x = NVIM9.fn['len'](vim.api['nvim_get_autocmds']({ ['group'] = 'matchparen' }))
 return __VIM9_MODULE
 

crates/vim9-gen/testdata/output/vim9_gen__test__call.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1835
+assertion_line: 1842
 expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
 ---
 ----------------------------------------
@@ -11,12 +11,13 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 local NVIM9 = require('_vim9script')
 local __VIM9_MODULE = {}
 local MyCoolFunc = nil
+local x = nil
 -- vim9script
 
 MyCoolFunc = function()
   return 5
 end
 
-local x = NVIM9.ops['Plus'](MyCoolFunc(), 1)
+x = NVIM9.ops['Plus'](MyCoolFunc(), 1)
 return __VIM9_MODULE
 

crates/vim9-gen/testdata/output/vim9_gen__test__expr.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1832
+assertion_line: 1839
 expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
 ---
 ----------------------------------------
@@ -10,15 +10,18 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 
 local NVIM9 = require('_vim9script')
 local __VIM9_MODULE = {}
+local x = nil
+local literal = nil
+local func_call = nil
 -- vim9script
 
-local x = 1 + 2
+x = 1 + 2
 print(x)
 
-local literal = NVIM9.fn['charcol']('.') - 1
+literal = NVIM9.fn['charcol']('.') - 1
 print(literal)
 
-local func_call = NVIM9.ops['Minus'](MyFunc(), 1)
+func_call = NVIM9.ops['Minus'](MyFunc(), 1)
 print(func_call)
 return __VIM9_MODULE
 

crates/vim9-gen/testdata/output/vim9_gen__test__if.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1833
+assertion_line: 1840
 expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unwrap().lua"
 ---
 ----------------------------------------
@@ -10,9 +10,10 @@ expression: "generate(contents, ParserOpts { mode: ParserMode::Standalone }).unw
 
 local NVIM9 = require('_vim9script')
 local __VIM9_MODULE = {}
+local x = nil
 -- vim9script
 
-local x = true
+x = true
 if NVIM9.bool(x) then
   print(x)
 end