Skip to content

FIX: Attempt to Index Upvalues (terminal and cache) #3

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
epoll31 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

FIX: Attempt to Index Upvalues (terminal and cache) #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b5457
fixed bugs by referncing required sections directly
epoll31 Mar 18, 2025
8679f10
--amend
epoll31 Mar 18, 2025
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
214 changes: 106 additions & 108 deletions lua/run/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,136 +1,134 @@
local M = {
config = {
auto_save = false,
notification_format = nil,
disable_number = true,
darken = 0.2,
winopts = {
split = "below",
height = 0.25
},
auto_scroll = true
}
config = {
auto_save = false,
notification_format = nil,
disable_number = true,
darken = 0.2,
winopts = {
split = "below",
height = 0.25,
},
auto_scroll = true,
},
}

local terminal = nil

local function effective_cwd()
local git = vim.fs.find(".git", { upward = true, type = "directory" })[1]
if git then
return vim.fs.dirname(git)
else
return vim.uv.cwd()
end
local git = vim.fs.find(".git", { upward = true, type = "directory" })[1]
if git then
return vim.fs.dirname(git)
else
return vim.uv.cwd()
end
end

local function highlight(input)
local ok, parser = pcall(vim.treesitter.get_string_parser, input, vim.fs.basename(vim.o.shell))
if not ok then
ok, parser = pcall(vim.treesitter.get_string_parser, input, "bash")
if not ok then
return {}
end
end

local tree = parser:parse()[1]
local query = vim.treesitter.query.get(parser:lang(), "highlights")

local highlights = {}
for id, node in query:iter_captures(tree:root(), input) do
local _, cstart, _, cend = node:range()
local hl = { cstart, cend, "@" .. query.captures[id] }

-- HACK: vim.ui.input doesn't like overlapping highlights, so if we find an overlap, we override the previous highlight.
-- We do this instead of skipping since builtins come after functions in the iterator for some reason (on purpose for overriding?).
-- This makes the assumption that overlaps can only be exact, since implementing this properly would be quite some effort,
-- so I won't do it until someone runs into a case where that assumption is not sufficient.
for i, inner in ipairs(highlights) do
if inner[1] == cstart and inner[2] == cend then
highlights[i] = hl
goto skip
end
end

table.insert(highlights, hl)

::skip::
end
return highlights
local ok, parser = pcall(vim.treesitter.get_string_parser, input, vim.fs.basename(vim.o.shell))
if not ok then
ok, parser = pcall(vim.treesitter.get_string_parser, input, "bash")
if not ok then
return {}
end
end

local tree = parser:parse()[1]
local query = vim.treesitter.query.get(parser:lang(), "highlights")

local highlights = {}
for id, node in query:iter_captures(tree:root(), input) do
local _, cstart, _, cend = node:range()
local hl = { cstart, cend, "@" .. query.captures[id] }

-- HACK: vim.ui.input doesn't like overlapping highlights, so if we find an overlap, we override the previous highlight.
-- We do this instead of skipping since builtins come after functions in the iterator for some reason (on purpose for overriding?).
-- This makes the assumption that overlaps can only be exact, since implementing this properly would be quite some effort,
-- so I won't do it until someone runs into a case where that assumption is not sufficient.
for i, inner in ipairs(highlights) do
if inner[1] == cstart and inner[2] == cend then
highlights[i] = hl
goto skip
end
end

table.insert(highlights, hl)

::skip::
end
return highlights
end

local function run_command(command, cwd)
if M.config.auto_save and vim.api.nvim_buf_get_option(vim.api.nvim_win_get_buf(0), "modified") then
vim.cmd("write")
end
if M.config.notification_format then
vim.notify(string.format(M.config.notification_format, command))
end

terminal.run_command(M.config, command, cwd)
if M.config.auto_save and vim.api.nvim_buf_get_option(vim.api.nvim_win_get_buf(0), "modified") then
vim.cmd("write")
end
if M.config.notification_format then
vim.notify(string.format(M.config.notification_format, command))
end

require("run.terminal").run_command(M.config, command, cwd)
end

local function prompt(default, callback)
vim.ui.input({
prompt = "Run command: ",
default = default,
completion = "shellcmd",
highlight = highlight
}, function(input)
if input then
callback(input)
end
end)
vim.ui.input({
prompt = "Run command: ",
default = default,
completion = "shellcmd",
highlight = highlight,
}, function(input)
if input then
callback(input)
end
end)
end

local function prompt_new(previous, cwd)
prompt(previous, function(command)
M.cache[cwd] = command
run_command(command, cwd)
end)
prompt(previous, function(command)
require("run.cache")[cwd] = command
run_command(command, cwd)
end)
end

function M.run(command, override)
local cwd = effective_cwd()

if override then
if command then
M.cache[cwd] = command
run_command(command, cwd)
else
prompt_new(M.cache[cwd], cwd)
end
else
command = command or M.cache[cwd]

if command then
run_command(command, cwd)
else
prompt_new(nil, cwd)
end
end
local cwd = effective_cwd()

if override then
if command then
require("run.cache")[cwd] = command
run_command(command, cwd)
else
prompt_new(require("run.cache")[cwd], cwd)
end
else
command = command or require("run.cache")[cwd]

if command then
run_command(command, cwd)
else
prompt_new(nil, cwd)
end
end
end

function M.run_prompt()
prompt(nil, run_command)
prompt(nil, run_command)
end

function M.setup(user_config)
if user_config then
M.config = vim.tbl_deep_extend("force", M.config, user_config)
end

M.cache = require("run.cache")
terminal = require("run.terminal")

vim.api.nvim_create_user_command("Run", function(cmd)
if cmd.args == "" then
M.run(nil, cmd.bang)
else
M.run(cmd.args, cmd.bang)
end
end, { bang = true, nargs = "?" })

vim.api.nvim_create_user_command("RunPrompt", M.run_prompt, {})
if user_config then
M.config = vim.tbl_deep_extend("force", M.config, user_config)
end

-- M.cache = require("run.cache")
-- M.terminal = require("run.terminal")

vim.api.nvim_create_user_command("Run", function(cmd)
if cmd.args == "" then
M.run(nil, cmd.bang)
else
M.run(cmd.args, cmd.bang)
end
end, { bang = true, nargs = "?" })

vim.api.nvim_create_user_command("RunPrompt", M.run_prompt, {})
end

return M