Skip to content

fix: check tanka use at command execution time #7

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
jemag wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: check tanka use at command execution time #7

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
23 changes: 13 additions & 10 deletions lua/nvim-jsonnet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@ local defaults = {
M.setup = function(options)
M.options = vim.tbl_deep_extend('force', {}, defaults, options or {})

if M.options.use_tanka_if_possible then
-- Use Tanka if `tk tool jpath` works.
local _ = vim.fn.system('tk tool jpath ' .. vim.fn.shellescape(vim.fn.expand('%')))
if vim.api.nvim_get_vvar('shell_error') == 0 then
M.options.jsonnet_bin = 'tk'
M.options.jsonnet_args = { 'eval' }
end
end

vim.api.nvim_create_user_command(
'JsonnetPrintConfig',
function()
Expand All @@ -40,7 +31,19 @@ M.setup = function(options)
vim.api.nvim_create_user_command(
'JsonnetEval',
function(opts)
utils.RunCommand(M.options.jsonnet_bin, M.options.jsonnet_args, 'json', opts)

local jsonnet_bin = M.options.jsonnet_bin
local jsonnet_args = M.options.jsonnet_args

if M.options.use_tanka_if_possible then
-- Use Tanka if `tk tool jpath` works.
local _ = vim.fn.system('tk tool jpath ' .. vim.fn.shellescape(vim.fn.expand('%')))
if vim.api.nvim_get_vvar('shell_error') == 0 then
jsonnet_bin = 'tk'
jsonnet_args = { 'eval' }
end
end
utils.RunCommand(jsonnet_bin, jsonnet_args, 'json', opts)
end,
{ nargs = '?' })

Expand Down