Skip to content

Commit

Permalink
feat(esupports.hop): link jump to line + fixes + refactoring (#903)
Browse files Browse the repository at this point in the history 
Co-authored-by: anon <anon>
  • Loading branch information
@fniyaz
fniyaz authored May 27, 2023
1 parent f922d59 commit 49610cd
Showing 1 changed file with 131 additions and 69 deletions.
200 changes: 131 additions & 69 deletions lua/neorg/modules/core/esupports/hop/module.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,24 @@ module.public = {

local located_link_information = module.public.locate_link_target(parsed_link)

if located_link_information then
local function os_open_link(link_location)
local o = {}
if neorg.configuration.os_info == "windows" then
o.command = "rundll32.exe"
o.args = { "url.dll,FileProtocolHandler", link_location }
else
if neorg.configuration.os_info == "linux" then
o.command = "xdg-open"
elseif neorg.configuration.os_info == "mac" then
o.command = "open"
end
o.args = { link_location }
end

job:new(o):start()
end

local function open_split()
if split then
if split == "vsplit" then
vim.cmd("vsplit")
Expand All @@ -88,24 +105,88 @@ module.public = {
vim.cmd("tabnew")
end
end
end

if not vim.tbl_isempty(located_link_information) then
if located_link_information.buffer ~= vim.api.nvim_get_current_buf() then
vim.api.nvim_buf_set_option(located_link_information.buffer, "buflisted", true)
vim.api.nvim_set_current_buf(located_link_information.buffer)
end
local function jump_to_line(line)
vim.cmd([[normal! m`]])
local status, _ = pcall(vim.api.nvim_win_set_cursor, 0, { line, 1 })
if not status then
log.error("Can't go to line ", line)
end
end

if not located_link_information.node then
return
end
if located_link_information then
neorg.lib.match(located_link_information.type)({
-- If we're dealing with a URI, simply open the URI in the user's preferred method
external_app = function()
os_open_link(located_link_information.uri)
end,

local range =
module.required["core.integrations.treesitter"].get_node_range(located_link_information.node)
-- If we're dealing with an external file, open it up in another Neovim buffer (unless otherwise applicable)
external_file = function()
open_split()

vim.cmd([[normal! m`]])
vim.api.nvim_win_set_cursor(0, { range.row_start + 1, range.column_start })
end
vim.api.nvim_cmd({ cmd = "edit", args = { located_link_information.path } }, {})

if located_link_information.line then
jump_to_line(located_link_information.line)
end
end,

buffer = function()
open_split()

if located_link_information.buffer ~= vim.api.nvim_get_current_buf() then
vim.api.nvim_buf_set_option(located_link_information.buffer, "buflisted", true)
vim.api.nvim_set_current_buf(located_link_information.buffer)
end

if located_link_information.line then
jump_to_line(located_link_information.line)
return
end

if located_link_information.node then
local range = module.required["core.integrations.treesitter"].get_node_range(
located_link_information.node
)

vim.cmd([[normal! m`]])
vim.api.nvim_win_set_cursor(0, { range.row_start + 1, range.column_start })
return
end
end,

calendar = function()
local calendar = neorg.modules.get_module("core.ui.calendar")
if not calendar then
log.error("`core.ui.calendar` is not loaded! Unable to open timestamp.")
return
end

local tempus = neorg.modules.get_module("core.tempus")
if not tempus then
log.error("`core.tempus` is not loaded! Unable to parse timestamp.")
return
end

local buffer = vim.api.nvim_get_current_buf()
calendar.select_date({
date = located_link_information.date,
callback = function(input)
local start_row, start_col, end_row, end_col = located_link_information.node:range()
vim.api.nvim_buf_set_text(
buffer,
start_row,
start_col,
end_row,
end_col,
{ "{@ " .. tostring(tempus.to_date(input, false)) .. "}" }
)
end,
})
end,
})
return
end

Expand Down Expand Up @@ -302,6 +383,7 @@ module.public = {
(link_target_heading4)
(link_target_heading5)
(link_target_heading6)
(link_target_line_number)
]? @link_type
text: (paragraph)? @link_location_text
)
Expand Down Expand Up @@ -403,58 +485,55 @@ module.public = {

if not parsed_link_information.link_type then
return {
type = "buffer",
original_title = nil,
node = nil,
buffer = buf_pointer,
}
end
end

local function os_open_link(link_location)
local o = {}
if neorg.configuration.os_info == "windows" then
o.command = "rundll32.exe"
o.args = { "url.dll,FileProtocolHandler", link_location }
else
if neorg.configuration.os_info == "linux" then
o.command = "xdg-open"
elseif neorg.configuration.os_info == "mac" then
o.command = "open"
end
o.args = { link_location }
end

job:new(o):start()
end

return neorg.lib.match(parsed_link_information.link_type)({
-- If we're dealing with a URL, simply open the URL in the user's preferred method
url = function()
os_open_link(parsed_link_information.link_location_text)

return {}
return { type = "external_app", uri = parsed_link_information.link_location_text }
end,

-- If we're dealing with an external file, open it up in another Neovim buffer (unless otherwise applicable)
external_file = function()
local destination = parsed_link_information.link_location_text
local path, line = string.match(destination, "^(.*):(%d+)$")
if line then
destination = path
line = tonumber(line)
end
destination = (
vim.tbl_contains({ "/", "~" }, destination:sub(1, 1)) and "" or (vim.fn.expand("%:p:h") .. "/")
) .. destination

local function open_in_external_app()
os_open_link(vim.uri_from_fname(vim.fn.expand(destination)))
end

neorg.lib.match(vim.fn.fnamemodify(destination, ":e"))({
pdf = open_in_external_app,
png = open_in_external_app,
[{ "jpg", "jpeg" }] = open_in_external_app,
[module.config.public.external_filetypes] = open_in_external_app,
_ = neorg.lib.wrap(vim.api.nvim_cmd, {cmd="edit", args={vim.fn.fnamemodify(destination, ":p")}}, {}),
return neorg.lib.match(vim.fn.fnamemodify(destination, ":e"))({
[{ "jpg", "jpeg", "png", "pdf" }] = {
type = "external_app",
uri = vim.uri_from_fname(vim.fn.expand(destination)),
},
[module.config.public.external_filetypes] = {
type = "external_app",
uri = vim.uri_from_fname(vim.fn.expand(destination)),
},
_ = function()
return {
type = "external_file",
path = vim.fn.fnamemodify(destination, ":p"),
line = line,
}
end,
})
end,

return {}
line_number = function()
return {
type = "buffer",
buffer = buf_pointer,
line = tonumber(parsed_link_information.link_location_text),
}
end,

timestamp = function()
Expand All @@ -472,29 +551,11 @@ module.public = {
return {}
end

local calendar = neorg.modules.get_module("core.ui.calendar")

if not calendar then
log.error("`core.ui.calendar` is not loaded! Unable to open timestamp.")
return {}
end

calendar.select_date({
return {
type = "calendar",
date = tempus.to_lua_date(parsed_date),
callback = function(input)
local start_row, start_col, end_row, end_col = parsed_link_information.link_node:range()
vim.api.nvim_buf_set_text(
buf_pointer,
start_row,
start_col,
end_row,
end_col,
{ "{@ " .. tostring(tempus.to_date(input, false)) .. "}" }
)
end,
})

return {}
node = parsed_link_information.link_node,
}
end,

_ = function()
Expand Down Expand Up @@ -583,6 +644,7 @@ module.public = {

if title:lower() == target:lower() then
return {
type = "buffer",
original_title = original_title,
node = node,
buffer = buf_pointer,
Expand Down

0 comments on commit 49610cd

Please sign in to comment.