Skip to content

Commit 97c21a4

Browse files
committed
Support configuring popup kind
1 parent 2cc5daf commit 97c21a4

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ neogit.setup {
245245
kind = "floating_console",
246246
},
247247
popup = {
248-
kind = "split",
248+
kind = "popup",
249249
},
250250
stash = {
251251
kind = "tab",

doc/neogit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ to Neovim users.
259259
kind = "floating_console",
260260
},
261261
popup = {
262-
kind = "split",
262+
kind = "popup",
263263
},
264264
stash = {
265265
kind = "tab",

lua/neogit/config.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ end
9494
---| "vsplit" Open in a vertical split
9595
---| "floating" Open in a floating window
9696
---| "floating_console" Open in a floating window across the bottom of the screen
97+
---| "popup" Open in a popup
9798
---| "auto" vsplit if window would have 80 cols, otherwise split
9899

99100
---@class NeogitCommitBufferConfig Commit buffer options
@@ -518,7 +519,7 @@ function M.get_default_values()
518519
kind = "floating_console",
519520
},
520521
popup = {
521-
kind = "split",
522+
kind = "popup",
522523
},
523524
stash = {
524525
kind = "tab",
@@ -776,13 +777,14 @@ function M.validate_config()
776777
"floating",
777778
"floating_console",
778779
"replace",
780+
"popup",
779781
"auto",
780782
}, val)
781783
then
782784
err(
783785
name,
784786
string.format(
785-
"Expected `%s` to be one of 'split', 'vsplit', 'split_above', 'vsplit_left', tab', 'floating', 'replace' or 'auto', got '%s'",
787+
"Expected `%s` to be one of 'split', 'vsplit', 'split_above', 'split_above_all', 'split_below', 'split_below_all', 'vsplit_left', tab', 'floating', 'floating_console', 'replace', 'popup' or 'auto', got '%s'",
786788
name,
787789
val
788790
)

lua/neogit/lib/popup/init.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
local config = require("neogit.config")
12
local PopupBuilder = require("neogit.lib.popup.builder")
23
local Buffer = require("neogit.lib.buffer")
34
local logger = require("neogit.logger")
@@ -410,7 +411,7 @@ function M:show()
410411
self.buffer = Buffer.create {
411412
name = self.state.name,
412413
filetype = "NeogitPopup",
413-
kind = "popup",
414+
kind = config.values.popup.kind,
414415
mappings = self:mappings(),
415416
status_column = " ",
416417
autocmds = {

0 commit comments

Comments
 (0)