Improved passing bang to functions

lua/nvim-treesitter/configs.lua

@@ -332,7 +332,7 @@ function M.setup(user_data)
 
   local ensure_installed = user_data.ensure_installed or {}
   if #ensure_installed > 0 then
-    require'nvim-treesitter.install'.ensure_installed('')(ensure_installed)
+    require'nvim-treesitter.install'.ensure_installed(ensure_installed)
   end
 
   config.modules.ensure_installed = nil

lua/nvim-treesitter/install.lua

@@ -284,7 +284,15 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
 end
 
 local function install_lang(bang, lang, cache_folder, install_folder, with_sync, generate_from_grammar)
-  if is_installed(lang) and bang ~= '!' then return 1 end
+  if is_installed(lang) and not bang then return 1 end
+
+  -- if ask_reinstall ~= 'force' then
+  --   if not ask_reinstall then return end
+  --
+  --   local yesno = fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
+  --   print('\n ') -- mandatory to avoid messing up command line
+  --   if not string.match(yesno, '^y.*') then return end
+  -- end
 
   local parser_config = parsers.get_parser_configs()[lang]
   if not parser_config then
@@ -301,13 +309,13 @@ local function install_lang(bang, lang, cache_folder, install_folder, with_sync,
   return 0
 end
 
-local function install(options)
+local function install(bang, options)
   options = options or {}
   local with_sync = options.with_sync
+  -- local ask_reinstall = options.ask_reinstall
   local generate_from_grammar = options.generate_from_grammar
   local exclude_configured_parsers = options.exclude_configured_parsers
 
-  return function (bang)
   return function (...)
     if fn.executable('git') == 0 then
       return api.nvim_err_writeln('Git is required on your system to run this command')
@@ -344,12 +352,10 @@ local function install(options)
       print('Parsers already installed. Use :TSInstall! to force reinstallation.')
     end
   end
-  end
 end
 
 function M.update(options)
   options = options or {}
-  return function(bang)
   return function (...)
     M.lockfile = {}
     reset_progress_counter()
@@ -359,7 +365,7 @@ function M.update(options)
       for _, lang in ipairs(languages) do
           if (not is_installed(lang)) or (needs_update(lang)) then
             installed = installed + 1
-              install({ with_sync = options.with_sync })('!')(lang)
+            install({ with_sync = options.with_sync })(true, lang)
           end
       end
       if installed == 0 then
@@ -376,15 +382,13 @@ function M.update(options)
         install({
           exclude_configured_parsers = true,
           with_sync = options.with_sync
-          })('!')(lang)
+        })(true, lang)
-        end
       end
     end
   end
 end
 
-function M.uninstall(bang)
+function M.uninstall()
-  return function (lang)
   local path_sep = '/'
   if fn.has('win32') == 1 then
     path_sep = '\\'
@@ -411,7 +415,6 @@ function M.uninstall(bang)
     }
     M.iter_cmd(command_list, 1, lang, 'Treesitter parser for '..lang..' has been uninstalled')
   end
-  end
 end
 
 function M.write_lockfile(verbose, skip_langs)
@@ -451,7 +454,8 @@ M.ensure_installed = install({ exclude_configured_parsers = true })
 
 M.commands = {
   TSInstall = {
-    run = install({ }),
+    run = install(false, { }),
+    ['run!'] = install(true, { }),
     args = {
       "-nargs=+",
       "-bang",
@@ -459,7 +463,8 @@ M.commands = {
     },
   },
   TSInstallFromGrammar = {
-    run = install({ generate_from_grammar = true }),
+    run = install(false, { generate_from_grammar = true }),
+    ['run!'] = install(true, { generate_from_grammar = true }),
     args = {
       "-nargs=+",
       "-bang",
@@ -467,7 +472,8 @@ M.commands = {
     },
   },
   TSInstallSync = {
-    run = install({ with_sync = true }),
+    run = install(false, { with_sync = true }),
+    ['run!'] = install(true, { with_sync = true }),
     args = {
       "-nargs=+",
       "-bang",

lua/nvim-treesitter/utils.lua

@@ -6,7 +6,7 @@ local M = {}
 
 function M.setup_commands(mod, commands)
   for command_name, def in pairs(commands) do
-    local call_fn = string.format("lua require'nvim-treesitter.%s'.commands.%s.run('<bang>')(<f-args>)", mod, command_name)
+    local call_fn = string.format("lua require'nvim-treesitter.%s'.commands.%s['run<bang>'](<f-args>)", mod, command_name)
     local parts = vim.tbl_flatten({
       "command!",
       def.args,