Skip to content

Commit f242d54

Browse files
committed
fix: Layout config not being respected. (fixes #268)
1 parent e37b2d9 commit f242d54

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ DiffView.get_updated_files = async.wrap(function(self, callback)
284284
self.path_args,
285285
self.options,
286286
{
287-
default_layout = DiffView.get_default_diff2(),
287+
default_layout = DiffView.get_default_layout(),
288288
merge_layout = DiffView.get_default_merge_layout(),
289289
},
290290
callback

lua/diffview/scene/views/file_history/file_history_panel.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ function FileHistoryPanel:update_entries(callback)
278278

279279
finalizer = self.adapter:file_history(
280280
self.log_options,
281-
{ default_layout = self.parent.get_default_diff2(), },
281+
{ default_layout = self.parent.get_default_layout(), },
282282
update
283283
)
284284

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,17 @@ function FileHistoryView.get_default_layout_name()
214214
return config.get_config().view.file_history.layout
215215
end
216216

217+
---@override
218+
---@return Layout # (class) The default layout class.
219+
function FileHistoryView.get_default_layout()
220+
local name = FileHistoryView.get_default_layout_name()
221+
222+
if name == -1 then
223+
return FileHistoryView.get_default_diff2()
224+
end
225+
226+
return config.name_to_layout(name --[[@as string ]])
227+
end
228+
217229
M.FileHistoryView = FileHistoryView
218230
return M

0 commit comments

Comments
 (0)