Skip to content

Fix pty for handling devpod provider setup #204

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −3
Open

Fix pty for handling devpod provider setup #204

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion lua/remote-nvim/providers/devpod/devpod_provider.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,11 @@ function DevpodProvider:_handle_provider_setup()
if self._devpod_provider then
self.local_provider:run_command(
("%s provider list --output json"):format(remote_nvim.config.devpod.binary),
("Checking if the %s provider is present"):format(self._devpod_provider)
("Checking if the %s provider is present"):format(self._devpod_provider),
nil,
nil,
false,
false
)
local stdout = self.local_provider.executor:job_stdout()
local provider_list_output = vim.json.decode(vim.tbl_isempty(stdout) and "{}" or table.concat(stdout, "\n"))
Expand Down
3 changes: 2 additions & 1 deletion lua/remote-nvim/providers/executor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ local Executor = require("remote-nvim.middleclass")("Executor")
---@field additional_opts? string[] Additional options to pass to the `tar` command. See `man tar` for possible options

---@class remote-nvim.provider.Executor.JobOpts
---@field pty boolean? Whether to set pty option
---@field additional_conn_opts string? Connection options
---@field stdout_cb function? Standard output callback
---@field exit_cb function? On exit callback
Expand Down Expand Up @@ -76,7 +77,7 @@ function Executor:run_executor_job(command, job_opts)

self:reset() -- Reset job internal state variables
self._job_id = vim.fn.jobstart(command, {
pty = true,
pty = job_opts.pty == nil or job_opts.pty,
on_stdout = function(_, data_chunk)
self:process_stdout(data_chunk, job_opts.stdout_cb)
end,
Expand Down
4 changes: 3 additions & 1 deletion lua/remote-nvim/providers/provider.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,8 @@ end
---@param extra_opts string? Extra options to pass to the underlying command
---@param exit_cb function? Exit callback to execute
---@param on_local_executor boolean? Should run this command on the local executor
function Provider:run_command(command, desc, extra_opts, exit_cb, on_local_executor)
---@param pty boolean? Whether to use pty or not
function Provider:run_command(command, desc, extra_opts, exit_cb, on_local_executor, pty)
self.logger.fmt_debug("[%s][%s] Running %s", self.provider_type, self.unique_host_id, command)
on_local_executor = on_local_executor or false
local executor = on_local_executor and self.local_executor or self.executor
Expand All @@ -1008,6 +1009,7 @@ function Provider:run_command(command, desc, extra_opts, exit_cb, on_local_execu
exit_cb = exit_cb(section_node)
end
executor:run_command(command, {
pty = pty == nil or pty,
additional_conn_opts = extra_opts,
exit_cb = exit_cb,
stdout_cb = self:_get_stdout_fn_for_node(section_node),
Expand Down