refactor: move helper functions to popup module

Author: jakubbortlik

lua/gitlab/actions/comment.lua

@@ -207,8 +207,8 @@ M.create_comment_layout = function(opts)
   local settings = u.merge(popup_settings, overrides or {})
 
   M.current_win = vim.api.nvim_get_current_win()
-  M.comment_popup = Popup(u.create_popup_state(title, settings))
-  M.draft_popup = Popup(u.create_box_popup_state("Draft", false, settings))
+  M.comment_popup = Popup(popup.create_popup_state(title, settings))
+  M.draft_popup = Popup(popup.create_box_popup_state("Draft", false, settings))
   M.start_line, M.end_line = u.get_visual_selection_boundaries()
 
   local internal_layout = Layout.Box({

lua/gitlab/actions/create_mr.lua

@@ -330,19 +330,19 @@ end
 
 M.create_layout = function()
   local settings = u.merge(state.settings.popup, state.settings.popup.create_mr or {})
-  local title_popup = Popup(u.create_box_popup_state("Title", false, settings))
+  local title_popup = Popup(popup.create_box_popup_state("Title", false, settings))
   M.title_bufnr = title_popup.bufnr
-  local description_popup = Popup(u.create_popup_state("Description", settings))
+  local description_popup = Popup(popup.create_popup_state("Description", settings))
   M.description_bufnr = description_popup.bufnr
-  local target_branch_popup = Popup(u.create_box_popup_state("Target branch", false, settings))
+  local target_branch_popup = Popup(popup.create_box_popup_state("Target branch", false, settings))
   M.target_bufnr = target_branch_popup.bufnr
   local delete_title = vim.o.columns > 110 and "Delete source branch" or "Delete source"
-  local delete_branch_popup = Popup(u.create_box_popup_state(delete_title, false, settings))
+  local delete_branch_popup = Popup(popup.create_box_popup_state(delete_title, false, settings))
   M.delete_branch_bufnr = delete_branch_popup.bufnr
   local squash_title = vim.o.columns > 110 and "Squash commits" or "Squash"
-  local squash_popup = Popup(u.create_box_popup_state(squash_title, false, settings))
+  local squash_popup = Popup(popup.create_box_popup_state(squash_title, false, settings))
   M.squash_bufnr = squash_popup.bufnr
-  local forked_project_id_popup = Popup(u.create_box_popup_state("Forked Project ID", false, settings))
+  local forked_project_id_popup = Popup(popup.create_box_popup_state("Forked Project ID", false, settings))
   M.forked_project_id_bufnr = forked_project_id_popup.bufnr
 
   local boxes = {}

lua/gitlab/actions/discussions/init.lua

@@ -284,7 +284,7 @@ end
 
 -- This function (settings.keymaps.discussion_tree.edit_comment) will open the edit popup for the current comment in the discussion tree
 M.edit_comment = function(tree, unlinked)
-  local edit_popup = Popup(u.create_popup_state("Edit Comment", state.settings.popup.edit))
+  local edit_popup = Popup(popup.create_popup_state("Edit Comment", state.settings.popup.edit))
   local current_node = tree:get_node()
   local note_node = common.get_note_node(tree, current_node)
   local root_node = common.get_root_node(tree, current_node)

lua/gitlab/actions/help.lua

@@ -20,7 +20,7 @@ M.open = function()
 
   local longest_line = u.get_longest_string(help_content_lines)
   local opts = { "Help", state.settings.popup.help, longest_line + 3, #help_content_lines, 70 }
-  local help_popup = Popup(u.create_popup_state(unpack(opts)))
+  local help_popup = Popup(popup.create_popup_state(unpack(opts)))
 
   help_popup:on(event.BufLeave, function()
     help_popup:unmount()

lua/gitlab/actions/merge.lua

@@ -8,7 +8,7 @@ local reviewer = require("gitlab.reviewer")
 local M = {}
 
 local function create_squash_message_popup()
-  return Popup(u.create_popup_state("Squash Commit Message", state.settings.popup.squash_message))
+  return Popup(popup.create_popup_state("Squash Commit Message", state.settings.popup.squash_message))
 end
 
 ---@class MergeOpts

lua/gitlab/actions/pipeline.lua

@@ -41,7 +41,7 @@ M.open = function()
   local height = 6 + #M.pipeline_jobs + 3
 
   local pipeline_popup =
-    Popup(u.create_popup_state("Loading Pipeline...", state.settings.popup.pipeline, width, height, 60))
+    Popup(popup.create_popup_state("Loading Pipeline...", state.settings.popup.pipeline, width, height, 60))
   popup.set_up_autocommands(pipeline_popup, nil, vim.api.nvim_get_current_win())
   M.pipeline_popup = pipeline_popup
   pipeline_popup:mount()

lua/gitlab/actions/summary.lua

@@ -168,15 +168,15 @@ end
 
 M.create_layout = function(info_lines)
   local settings = u.merge(state.settings.popup, state.settings.popup.summary or {})
-  local title_popup = Popup(u.create_box_popup_state(nil, false, settings))
+  local title_popup = Popup(popup.create_box_popup_state(nil, false, settings))
   M.title_bufnr = title_popup.bufnr
-  local description_popup = Popup(u.create_popup_state("Description", settings))
+  local description_popup = Popup(popup.create_popup_state("Description", settings))
   M.description_bufnr = description_popup.bufnr
   local details_popup
 
   local internal_layout
   if state.settings.info.enabled then
-    details_popup = Popup(u.create_box_popup_state("Details", false, settings))
+    details_popup = Popup(popup.create_box_popup_state("Details", false, settings))
     if state.settings.info.horizontal then
       local longest_line = u.get_longest_string(info_lines)
       internal_layout = Layout.Box({

lua/gitlab/popup.lua

@@ -2,6 +2,62 @@ local u = require("gitlab.utils")
 
 local M = {}
 
+---Get the popup view_opts
+---@param title string The string to appear on top of the popup
+---@param user_settings table|nil User-defined popup settings
+---@param width number? Override default width
+---@param height number? Override default height
+---@param zindex number? Override default zindex
+---@return table
+M.create_popup_state = function(title, user_settings, width, height, zindex)
+  local settings = u.merge(require("gitlab.state").settings.popup, user_settings or {})
+  local view_opts = {
+    buf_options = {
+      filetype = "markdown",
+    },
+    relative = "editor",
+    enter = true,
+    focusable = true,
+    zindex = zindex or 50,
+    border = {
+      style = settings.border,
+      text = {
+        top = title,
+      },
+    },
+    position = settings.position,
+    size = {
+      width = width and math.min(width, vim.o.columns - 2) or settings.width,
+      height = height and math.min(height, vim.o.lines - 3) or settings.height,
+    },
+    opacity = settings.opacity,
+  }
+
+  return view_opts
+end
+
+---Create view_opts for Box popups used inside popup Layouts
+---@param title string|nil The string to appear on top of the popup
+---@param enter boolean Whether the pop should be focused after creation
+---@param settings table User defined popup settings
+---@return table
+M.create_box_popup_state = function(title, enter, settings)
+  return {
+    buf_options = {
+      filetype = "markdown",
+    },
+    enter = enter or false,
+    focusable = true,
+    border = {
+      style = settings.border,
+      text = {
+        top = title,
+      },
+    },
+    opacity = settings.opacity,
+  }
+end
+
 local function exit(popup, opts)
   if opts.action_before_exit and opts.cb ~= nil then
     opts.cb()
@@ -102,7 +158,7 @@ M.set_up_autocommands = function(popup, layout, previous_window, opts)
     if layout ~= nil then
       layout:update()
     else
-      popup:update_layout(opts and u.create_popup_state(unpack(opts)))
+      popup:update_layout(opts and M.create_popup_state(unpack(opts)))
     end
   end)
 

lua/gitlab/utils/init.lua

@@ -480,62 +480,6 @@ M.difference = function(a, b)
   return not_included
 end
 
----Get the popup view_opts
----@param title string The string to appear on top of the popup
----@param settings table|nil User defined popup settings
----@param width number? Override default width
----@param height number? Override default height
----@param zindex number? Override default zindex
----@return table
-M.create_popup_state = function(title, settings, width, height, zindex)
-  settings = M.merge(require("gitlab.state").settings.popup, settings or {})
-  local view_opts = {
-    buf_options = {
-      filetype = "markdown",
-    },
-    relative = "editor",
-    enter = true,
-    focusable = true,
-    zindex = zindex or 50,
-    border = {
-      style = settings.border,
-      text = {
-        top = title,
-      },
-    },
-    position = settings.position,
-    size = {
-      width = width and math.min(width, vim.o.columns - 2) or settings.width,
-      height = height and math.min(height, vim.o.lines - 3) or settings.height,
-    },
-    opacity = settings.opacity,
-  }
-
-  return view_opts
-end
-
----Create view_opts for Box popups used inside popup Layouts
----@param title string|nil The string to appear on top of the popup
----@param enter boolean Whether the pop should be focused after creation
----@param settings table User defined popup settings
----@return table
-M.create_box_popup_state = function(title, enter, settings)
-  return {
-    buf_options = {
-      filetype = "markdown",
-    },
-    enter = enter or false,
-    focusable = true,
-    border = {
-      style = settings.border,
-      text = {
-        top = title,
-      },
-    },
-    opacity = settings.opacity,
-  }
-end
-
 M.read_file = function(file_path, opts)
   local file = io.open(file_path, "r")
   if file == nil then