Commit 59d556e

committed

Merge upstream PR sindrets#477 from sindrets/diffview.nvim

* pr-477: feat: auto close buffer opened by diff_view

2 parents 4516612 + 66107de commit 59d556eCopy full SHA for 59d556e

File tree

6 files changed

+25

-0

lines changed

README.md
doc
- diffview_defaults.txt
lua/diffview
- config.lua
- scene
  - view.lua
  - views
    - diff
      - diff_view.lua
    - file_history
      - file_history_view.lua

6 files changed

+25

-0

lines changed

`‎README.md‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ require("diffview").setup({`
`189`	`189`	`use_icons = true, -- Requires nvim-web-devicons`
`190`	`190`	`show_help_hints = true, -- Show hints for how to open the help panel`
`191`	`191`	`watch_index = true, -- Update views and index buffers when the git index changes.`
	`192`	`+ delete_buffer_on_diff_exit = false, -- Delete file buffers opened by diffview that were not opened`
`192`	`193`	`icons = { -- Only applies when use_icons is true.`
`193`	`194`	`folder_closed = "",`
`194`	`195`	`folder_open = "",`

`‎doc/diffview_defaults.txt‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ DEFAULT CONFIG diffview.defaults`
`10`	`10`	`use_icons = true, -- Requires nvim-web-devicons`
`11`	`11`	`show_help_hints = true, -- Show hints for how to open the help panel`
`12`	`12`	`watch_index = true, -- Update views and index buffers when the git index changes.`
	`13`	`+ delete_buffer_on_diff_exit = false, -- Delete file buffers opened by diffview that were not opened`
`13`	`14`	`icons = { -- Only applies when use_icons is true.`
`14`	`15`	`folder_closed = "",`
`15`	`16`	`folder_open = "",`

`‎lua/diffview/config.lua‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ M.defaults = {`
`44`	`44`	`use_icons = true,`
`45`	`45`	`show_help_hints = true,`
`46`	`46`	`watch_index = true,`
	`47`	`+ delete_buffer_on_diff_exit = false,`
`47`	`48`	`icons = {`
`48`	`49`	`folder_closed = "",`
`49`	`50`	`folder_open = "",`

`‎lua/diffview/scene/view.lua‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ function View:init_layout() oop.abstract_stub() end`
`38`	`38`	`---@abstract`
`39`	`39`	`function View:post_open() oop.abstract_stub() end`
`40`	`40`
	`41`	`+---@abstract`
	`42`	`+function View:pre_open() oop.abstract_stub() end`
	`43`	`+`
`41`	`44`	`---@diagnostic enable unused-local`
`42`	`45`
`43`	`46`	`---View constructor`
`@@ -62,6 +65,7 @@ function View:init(opt)`
`62`	`65`	`end`
`63`	`66`
`64`	`67`	`function View:open()`
	`68`	`+ self:pre_open()`
`65`	`69`	`vim.cmd("tab split")`
`66`	`70`	`self.tabpage = api.nvim_get_current_tabpage()`
`67`	`71`	`self:init_layout()`

`‎lua/diffview/scene/views/diff/diff_view.lua‎`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,11 @@ function DiffView:init(opt)`
`77`	`77`	`self.attached_bufs = {}`
`78`	`78`	`self.emitter:on("file_open_post", utils.bind(self.file_open_post, self))`
`79`	`79`	`self.valid = true`
	`80`	`+ self.buffers_pre_open = {}`
	`81`	`+end`
	`82`	`+`
	`83`	`+function DiffView:pre_open()`
	`84`	`+ self.buffers_pre_open = vim.api.nvim_list_bufs()`
`80`	`85`	`end`
`81`	`86`
`82`	`87`	`function DiffView:post_open()`
`@@ -170,6 +175,16 @@ end`
`170`	`175`
`171`	`176`	`---@override`
`172`	`177`	`function DiffView:close()`
	`178`	`+ if config.get_config().delete_buffer_on_diff_exit then`
	`179`	`+ -- delete buffers that were opened by the view`
	`180`	`+ local buffers_pre_close = vim.api.nvim_list_bufs()`
	`181`	`+ for _, buf in ipairs(buffers_pre_close) do`
	`182`	`+ if not vim.tbl_contains(self.buffers_pre_open, buf) then`
	`183`	`+ vim.api.nvim_buf_delete(buf, { force = false})`
	`184`	`+ end`
	`185`	`+ end`
	`186`	`+ end`
	`187`	`+`
`173`	`188`	`if not self.closing:check() then`
`174`	`189`	`self.closing:send()`
`175`	`190`

`‎lua/diffview/scene/views/file_history/file_history_view.lua‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ function FileHistoryView:init(opt)`
`39`	`39`	`self.valid = true`
`40`	`40`	`end`
`41`	`41`
	`42`	`+function FileHistoryView:pre_open()`
	`43`	`+end`
	`44`	`+`
`42`	`45`	`function FileHistoryView:post_open()`
`43`	`46`	`self.commit_log_panel = CommitLogPanel(self.adapter, {`
`44`	`47`	`name = ("diffview://%s/log/%d/%s"):format(self.adapter.ctx.dir, self.tabpage, "commit_log"),`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 59d556e

File tree

6 files changed

6 files changed

`‎README.md‎`

`‎doc/diffview_defaults.txt‎`

`‎lua/diffview/config.lua‎`

`‎lua/diffview/scene/view.lua‎`

`‎lua/diffview/scene/views/diff/diff_view.lua‎`

`‎lua/diffview/scene/views/file_history/file_history_view.lua‎`

0 commit comments