Merge pull request #1 from Civitasv/master

Backmerge Main

Author: drook207

README.md

@@ -159,6 +159,7 @@ require("cmake-tools").setup {
         start_insert = false, -- If you want to enter terminal with :startinsert upon using :CMakeRun
         focus = false, -- Focus on terminal when cmake task is launched.
         do_not_add_newline = false, -- Do not hit enter on the command inserted when using :CMakeRun, allowing a chance to review or modify the command before hitting enter.
+        use_shell_alias = false, -- Hide the verbose command wrapper by using a shell alias, showing only the program's output (currently not supported on Windows)
       },
     },
   },

lua/cmake-tools/init.lua

@@ -348,6 +348,7 @@ function cmake.build(opt, callback)
   end
 
   local presets_exists = config.base_settings.use_preset and Presets.exists(config.cwd)
+  local use_build_preset = false
   if presets_exists then
     local presets = Presets:parse(config.cwd)
     if not config.build_preset then
@@ -367,9 +368,10 @@ function cmake.build(opt, callback)
     end
     if config.build_preset then
       local build_preset = presets:get_build_preset(config.build_preset)
-      if build_preset then
+      if build_preset and build_preset:is_valid() then
         config:update_build_target()
         config:update_build_type()
+        use_build_preset = true
       end
     end
   end
@@ -387,7 +389,7 @@ function cmake.build(opt, callback)
 
   local args
 
-  if presets_exists and config.build_preset then
+  if use_build_preset then
     args = { "--build", "--preset", config.build_preset } -- preset don't need define build dir.
   else
     args = {
@@ -868,32 +870,29 @@ function cmake.select_build_preset(callback)
           callback(Result:new_error(Types.NOT_SELECT_PRESET, "No build preset selected"))
           return
         end
+
         if config.build_preset ~= choice then
+          config.build_preset = choice
+
           local build_preset = presets:get_build_preset(choice)
-          if build_preset:is_valid() then
-            config.build_preset = choice
 
-            if build_preset then
-              config:update_build_target()
+          if build_preset and build_preset:is_valid() then
+            config:update_build_target()
+
+            local associated_configure_preset =
+              presets:get_configure_preset(build_preset.configurePreset, { include_hidden = true })
+            local associated_configure_preset_name = associated_configure_preset
+                and associated_configure_preset.name
+              or nil
+
+            if
+              associated_configure_preset_name
+              and config.configure_preset ~= associated_configure_preset_name
+            then
+              config.configure_preset = associated_configure_preset_name
             end
           end
         end
-        local associated_configure_preset = presets:get_configure_preset(
-          presets:get_build_preset(choice).configurePreset,
-          { include_hidden = true }
-        )
-        local associated_configure_preset_name = associated_configure_preset
-            and associated_configure_preset.name
-          or nil
-        local configure_preset_updated = false
-
-        if
-          associated_configure_preset_name
-          and config.configure_preset ~= associated_configure_preset_name
-        then
-          config.configure_preset = associated_configure_preset_name
-          configure_preset_updated = true
-        end
 
         callback(Result:new(Types.SUCCESS, nil, nil))
       end)
@@ -1184,7 +1183,7 @@ function cmake.run_test(opt, callback)
         return
       end
       if idx == 1 then
-        ctest.run(const.ctest_command, "'.*'", config:build_directory_path(), env, config, opt)
+        ctest.run(const.ctest_command, nil, config:build_directory_path(), env, config, opt)
       else
         ctest.run(
           const.ctest_command,

lua/cmake-tools/presets.lua

@@ -125,7 +125,8 @@ function Presets:parse(cwd)
     preset = createPreset(preset)
   end
 
-  for _, build_preset in ipairs(instance.buildPresets or {}) do
+  instance.buildPresets = instance.buildPresets or {}
+  for _, build_preset in ipairs(instance.buildPresets) do
     build_preset = createBuildPreset(build_preset)
   end
 

lua/cmake-tools/test/ctest.lua

@@ -38,7 +38,14 @@ function ctest.run(ctest_command, test_name, build_dir, env, config, opt)
   local cmd = ctest_command
   opt = opt or {}
 
-  local args = { "--test-dir", utils.transform_path(build_dir), "-R", test_name, opt.args }
+  local args = { "--test-dir", utils.transform_path(build_dir) }
+  if test_name then
+    table.insert(args, "-R")
+    table.insert(args, test_name)
+  end
+  if opt.args then
+    table.insert(args, opt.args)
+  end
   utils.run(cmd, config.env_script, env, args, config.cwd, config.runner, nil)
 end
 

lua/cmake-tools/vimux.lua

@@ -1,7 +1,7 @@
-local terminal = require("cmake-tools.terminal")
 local osys = require("cmake-tools.osys")
 local utils = require("cmake-tools.utils")
----@class vimux : terminal
+
+---@class vimux : executor, runner
 local _vimux = {
   id = nil,
 }
@@ -17,7 +17,9 @@ end
 function _vimux.run(cmd, env_script, env, args, cwd, opts, on_exit, on_output)
   local full_cmd = _vimux.prepare_cmd_for_run(cmd, env, args, cwd)
   vim.fn.VimuxRunCommand(full_cmd)
-  terminal.handle_exit(opts, on_exit, opts.close_on_exit)
+  if type(on_exit) == "function" then
+    on_exit(0) -- vimux does not provide exit codes, assume success
+  end
 end
 
 function _vimux.has_active_job(opts)