switch back to luafmt

common.sh

@@ -82,10 +82,17 @@ function check_binary() {
   fi
 }
 
+export PATH="${HOME}/.local/bin:${PATH}"
+
 for BINARY in "${NVIM_REQUIRED_BINARIES[@]}"; do
   check_binary "$BINARY"
 done
 
+if ! command -v luafmt >/dev/null 2>&1; then
+  npm install --global --prefix "${HOME}/.local" lua-fmt
+fi
+check_binary luafmt
+
 pushd "${SCRIPT_DIR}" 1>/dev/null 2>&1 || error_exit "failed to push: ${SCRIPT_DIR}"
 FNAME=cpptools-${NVIM_OS}-${NVIM_ARCH2}.vsix
 if [ ! -f "dap/${FNAME}" ]; then

nvim/lua/darcula/config/init.lua

@@ -177,7 +177,6 @@ NV_DARCULA_MASON_TOOL_LIST =
     "clang-format",
     "gofumpt",
     "google-java-format",
-    "luaformatter",
     "prettier",
     "shellcheck",
     "shfmt",

nvim/lua/darcula/setup/200_lsp.lua

@@ -46,8 +46,7 @@ vim.diagnostic.config(
         [vim.diagnostic.severity.HINT] = "DiagnosticLineNrHint"
       }
     },
-    virtual_text =
+    virtual_text = utils.iff(
-      utils.iff(
       NV_DARCULA_ENABLE_VIRTUAL_TEXT,
       {prefix = symbols.line.info .. " "},
       false

nvim/lua/darcula/setup/500_formatter.lua

@@ -19,27 +19,6 @@
 --
 local formatter_util = require("formatter.util")
 
-local lua_format_executable = function()
-  local executable = vim.fn.exepath("lua-format")
-  if executable ~= "" then
-    return executable
-  end
-
-  local native_executable =
-    vim.fs.joinpath(
-    vim.fs.dirname(vim.fn.stdpath("data")),
-    "nvim2",
-    "mason",
-    "bin",
-    "lua-format"
-  )
-  if vim.fn.executable(native_executable) ~= 0 then
-    return native_executable
-  end
-
-  return "lua-format"
-end
-
 require("formatter").setup {
   logging = true,
   log_level = vim.log.levels.WARN,
@@ -66,15 +45,16 @@ require("formatter").setup {
     javascriptreact = {require("formatter.filetypes.javascriptreact").prettier},
     json = {require("formatter.filetypes.json").prettier},
     lua = {
+      require("formatter.filetypes.lua").luafmt,
       function()
         return {
-          exe = lua_format_executable(),
+          exe = "luafmt",
           args = {
-            "--column-limit=80",
+            "--stdin",
-            "--indent-width=2",
+            "-l",
-            formatter_util.escape_path(
+            "80",
-              formatter_util.get_current_buffer_file_path()
+            "-i",
-            )
+            "2"
           },
           stdin = true
         }