Skip to content

fix(fvm/windows): append .bat extension on fvm command #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2025
Merged

fix(fvm/windows): append .bat extension on fvm command #469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions lua/flutter-tools/commands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ local current_device = nil
---@type flutter.Runner?
local runner = nil

local fvm_name = path.is_windows and "fvm.bat" or "fvm"

local function use_debugger_runner(force_debug)
if force_debug or config.debugger.enabled then
local dap_ok, _ = pcall(require, "dap")
Expand Down Expand Up @@ -190,9 +192,9 @@ end
local function get_absolute_path(input_path)
-- Check if the provided path is an absolute path
if
vim.fn.isdirectory(input_path) == 1
and not input_path:match("^/")
and not input_path:match("^%a:[/\\]")
vim.fn.isdirectory(input_path) == 1
and not input_path:match("^/")
and not input_path:match("^%a:[/\\]")
then
-- It's a relative path, so expand it to an absolute path
local absolute_path = vim.fn.fnamemodify(input_path, ":p")
Expand Down Expand Up @@ -235,23 +237,23 @@ local function has_flutter_dependency_in_pubspec(cwd)
if not pubspec then return default_has_flutter_dependency end
--https://github.com/Dart-Code/Dart-Code/blob/43914cd2709d77668e19a4edf3500f996d5c307b/src/shared/utils/fs.ts#L183
return (
pubspec.dependencies
and (
pubspec.dependencies.flutter
or pubspec.dependencies.flutter_test
or pubspec.dependencies.sky_engine
or pubspec.dependencies.flutter_goldens
)
)
or (
pubspec.devDependencies
and (
pubspec.devDependencies.flutter
or pubspec.devDependencies.flutter_test
or pubspec.devDependencies.sky_engine
or pubspec.devDependencies.flutter_goldens
pubspec.dependencies
and (
pubspec.dependencies.flutter
or pubspec.dependencies.flutter_test
or pubspec.dependencies.sky_engine
or pubspec.dependencies.flutter_goldens
)
)
or (
pubspec.devDependencies
and (
pubspec.devDependencies.flutter
or pubspec.devDependencies.flutter_test
or pubspec.devDependencies.sky_engine
or pubspec.devDependencies.flutter_goldens
)
)
)
end

---@param opts RunOpts
Expand Down Expand Up @@ -494,7 +496,7 @@ local fvm_list_job = nil
--- Returns table<{name: string, status: active|global|nil}>
function M.fvm_list(callback)
if not fvm_list_job then
fvm_list_job = Job:new({ command = "fvm", args = { "api", "list" } })
fvm_list_job = Job:new({ command = fvm_name, args = { "api", "list" } })

fvm_list_job:after_success(vim.schedule_wrap(function(j)
local out = j:result()
Expand Down Expand Up @@ -533,7 +535,7 @@ local fvm_use_job = nil

function M.fvm_use(sdk_name)
if not fvm_use_job then
fvm_use_job = Job:new({ command = "fvm", args = { "use", sdk_name } })
fvm_use_job = Job:new({ command = fvm_name, args = { "use", sdk_name } })

fvm_use_job:after_success(vim.schedule_wrap(function(j)
ui.notify(utils.join(j:result()))
Expand Down