fixes for first upstream PR (#19)

* fixup: stylua

* try updating to newer version of stylua, still can't reproduce

* fixup: justin comments

* lul, run stylua twice

* moved format to separate crate

* __NVIM9_MODULE -> M

* NVIM9 -> vim9

* special case vim9

* string escaping issues

Author: tjdevries

Cargo.lock

@@ -22,4 +22,5 @@ members = [
     "crates/vim9-gen",
     "crates/macros",
     "crates/vimfuncs",
+    "crates/format/",
 ]

Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "format"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+stylua = "0.15.3"

crates/format/Cargo.toml

@@ -0,0 +1,31 @@
+use stylua_lib::OutputVerification;
+
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+fn get_stylua_config() -> stylua_lib::Config {
+    stylua_lib::Config::new()
+        .with_column_width(100)
+        .with_line_endings(stylua_lib::LineEndings::Unix)
+        .with_indent_type(stylua_lib::IndentType::Spaces)
+        .with_indent_width(2)
+        .with_quote_style(stylua_lib::QuoteStyle::AutoPreferSingle)
+        .with_call_parentheses(stylua_lib::CallParenType::Always)
+        .with_collapse_simple_statement(stylua_lib::CollapseSimpleStatement::Never)
+}
+
+pub fn lua(code: &str) -> Result<String, (String, String)> {
+    let conf = get_stylua_config();
+    let code = match stylua_lib::format_code(code, conf, None, OutputVerification::None) {
+        Ok(res) => res,
+        Err(err) => return Err((code.to_string(), err.to_string())),
+    };
+
+    let code = match stylua_lib::format_code(&code, conf, None, OutputVerification::None) {
+        Ok(res) => res,
+        Err(err) => return Err((code.to_string(), err.to_string())),
+    };
+
+    Ok(code)
+}

crates/format/src/lib.rs

@@ -9,9 +9,9 @@ edition = "2021"
 lexer = { path = "../vim9-lexer", package = "vim9-lexer" }
 parser = { path = "../vim9-parser", package = "vim9-parser" }
 vimfuncs = { path = "../vimfuncs" }
+format = { path = "../format" }
 
 anyhow = "1.0.62"
-stylua = "0.14.3"
 
 rmp = "0.8.11"
 rmpv = "1.0.0"
@@ -23,5 +23,5 @@ insta = "1.19.0"
 pretty_assertions = "1.3.0"
 
 [build-dependencies]
-stylua = "0.14.3"
 anyhow = "1.0.62"
+format = { path = "../format" }

crates/vim9-gen/Cargo.toml

@@ -1,15 +1,5 @@
 use std::{fmt::Write, fs, path::Path};
 
-fn get_stylua_config() -> stylua_lib::Config {
-    stylua_lib::Config::new()
-        .with_column_width(100)
-        .with_line_endings(stylua_lib::LineEndings::Unix)
-        .with_indent_type(stylua_lib::IndentType::Spaces)
-        .with_indent_width(2)
-        .with_quote_style(stylua_lib::QuoteStyle::AutoPreferSingle)
-        .with_call_parentheses(stylua_lib::CallParenType::Always)
-}
-
 fn main() -> anyhow::Result<()> {
     println!("cargo:rerun-if-changed=src/lua/");
 
@@ -73,35 +63,28 @@ fn main() -> anyhow::Result<()> {
             .expect("to_str");
 
         let contents = fs::read_to_string(&entry)?;
-        let contents = contents.replace("require('_vim9script')", "NVIM9");
-        let contents = contents.replace("require(\"_vim9script\")", "NVIM9");
-        let contents = contents.replace("require \"_vim9script\"", "NVIM9");
+        let contents = contents.replace("require('_vim9script')", "vim9");
+        let contents = contents.replace("require(\"_vim9script\")", "vim9");
+        let contents = contents.replace("require \"_vim9script\"", "vim9");
 
         if name == "_" {
             writeln!(&mut file, "{}\n", contents)?;
         } else if name == "init" {
             // init.lua declares our base module and it's guaranteed to be first.
-            writeln!(&mut file, "local NVIM9 = (function() {} end)()\n", contents)?;
+            writeln!(&mut file, "local vim9 = (function() {} end)()\n", contents)?;
         } else {
             writeln!(
                 &mut file,
-                "NVIM9['{}'] = (function() {} end)()",
+                "vim9['{}'] = (function() {} end)()",
                 name, contents
             )?;
         }
     }
 
     writeln!(&mut file, "")?;
-    writeln!(&mut file, "return NVIM9")?;
-
-    // Format the final lib
-    let file = stylua_lib::format_code(
-        &file,
-        get_stylua_config(),
-        None,
-        stylua_lib::OutputVerification::None,
-    )
-    .expect(&format!("to format code: {}", file));
+    writeln!(&mut file, "return vim9")?;
+
+    let file = format::lua(&file).expect(&format!("to format code: {}", file));
 
     let init_lua = luadir.join("_vim9script.lua");
     fs::write(init_lua, file)?;

crates/vim9-gen/build.rs

@@ -248,10 +248,18 @@ pub fn generate(call: &CallExpression, state: &mut State) -> String {
 
     match func_data {
         FunctionData::ApiFunc { name, args } => {
-            format!("vim.api['{}']({})", name, args.gen(state))
+            if crate::ident::is_safe_str(&name) {
+                format!("vim.api.{}({})", name, args.gen(state))
+            } else {
+                format!("vim.api['{}']({})", name, args.gen(state))
+            }
         }
         FunctionData::VimFunc(VimFunc { name, args }) => {
-            format!("NVIM9.fn['{}']({})", name, args.gen(state))
+            if crate::ident::is_safe_str(&name) {
+                format!("vim9.fn.{}({})", name, args.gen(state))
+            } else {
+                format!("vim9.fn['{}']({})", name, args.gen(state))
+            }
         }
         FunctionData::VimFuncRef { name, arglist, .. } => match arglist {
             Some(arglist) => {
@@ -294,7 +302,7 @@ pub fn generate(call: &CallExpression, state: &mut State) -> String {
 }
 
 fn generate_mutable_fn_call(name: &str, args: &str, replace: &str) -> String {
-    return format!("NVIM9.fn_mut('{name}', {{ {args} }}, {{ replace = {replace} }})");
+    return format!("vim9.fn_mut('{name}', {{ {args} }}, {{ replace = {replace} }})");
 }
 
 pub fn generate_method(method: &parser::MethodCall, state: &mut State) -> String {