From 618c0a873a1cde7150617eda4287aadecaf19582 Mon Sep 17 00:00:00 2001
From: msc94 <msc94@users.noreply.github.com>
Date: Sat, 26 Aug 2023 21:51:16 +0200
Subject: [PATCH] Make url creation and opening two steps

---
 lua/openingh/init.lua | 13 +++++++------
 plugin/openingh.lua   | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/lua/openingh/init.lua b/lua/openingh/init.lua
index 4da7982..88e34f6 100644
--- a/lua/openingh/init.lua
+++ b/lua/openingh/init.lua
@@ -34,7 +34,7 @@ local function get_current_branch_or_commit_with_priority(priority)
   end
 end
 
-function M.open_file(
+function M.get_file_url(
   priority,
   --[[optional]]
   range_start,
@@ -67,12 +67,10 @@ function M.open_file(
     file_page_url = file_page_url .. "#L" .. range_start .. "-L" .. range_end
   end
 
-  if not utils.open_url(file_page_url) then
-    utils.notify("Could not open the built URL " .. file_page_url, vim.log.levels.ERROR)
-  end
+  return file_page_url
 end
 
-function M.open_repo(priority)
+function M.get_repo_url(priority)
   -- make sure to update the current directory
   M.setup()
   if M.is_no_git_origin then
@@ -80,8 +78,11 @@ function M.open_repo(priority)
     return
   end
 
-
   local url = M.repo_url .. "/tree/" .. get_current_branch_or_commit_with_priority(priority)
+  return url
+end
+
+function M.open_url(url)
   if not utils.open_url(url) then
     utils.notify("Could not open the built URL " .. url, vim.log.levels.ERROR)
   end
diff --git a/plugin/openingh.lua b/plugin/openingh.lua
index 531db6d..a6dfa18 100644
--- a/plugin/openingh.lua
+++ b/plugin/openingh.lua
@@ -13,11 +13,15 @@ local function complete_func(arg_lead, _, _)
 end
 
 vim.api.nvim_create_user_command("OpenInGHFile", function(opts)
+  local url
+
   if opts.range == 0 then -- Nothing was selected
-    openingh.open_file(opts.args)
-  else -- Current line or block was selected
-    openingh.open_file(opts.args, opts.line1, opts.line2)
+    url = openingh.get_file_url(opts.args)
+  else                    -- Current line or block was selected
+    url = openingh.get_file_url(opts.args, opts.line1, opts.line2)
   end
+
+  openingh.open_url(url)
 end, {
   range = true,
   nargs = '?',
@@ -25,11 +29,15 @@ end, {
 })
 
 vim.api.nvim_create_user_command("OpenInGHFileLines", function(opts)
+  local url
+
   if opts.range == 0 then -- Nothing was selected
-    openingh.open_file(opts.args, opts.line1)
-  else -- Current line or block was selected
-    openingh.open_file(opts.args, opts.line1, opts.line2)
+    url = openingh.get_file_url(opts.args, opts.line1)
+  else                    -- Current line or block was selected
+    url = openingh.get_file_url(opts.args, opts.line1, opts.line2)
   end
+
+  openingh.open_url(url)
 end, {
   range = true,
   nargs = '?',
@@ -37,7 +45,7 @@ end, {
 })
 
 vim.api.nvim_create_user_command("OpenInGHRepo", function(opts)
-  openingh.open_repo(opts.args)
+  openingh.open_url(openingh.get_repo_url(opts.args))
 end, {
   nargs = '?',
   complete = complete_func,