mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-12 00:26:24 -04:00
f7e26fec4e
The focused-main-view rework made the secondary pane actionable, but the old patch-building explorer's secondary was inert, so its actions were never thought through. Pressing space there routed through the same toggle handler as the main pane, resolving the selection against the secondary's diff and mapping it to patch-builder indices by line number. But the secondary shows the *aggregated* custom patch, which renumbers included additions whenever an earlier addition in the same hunk is excluded (Transform recomputes each hunk's +start). So the shifted number resolved to the wrong line in the original diff — often adding an unrelated line instead of removing the selected one. Resolve the secondary selection by its *ordinal* among the change lines shown instead: the custom-patch view renders exactly the included change lines in order, so the k-th change line of a file is that file's k-th included change line (PatchBuilder.IncludedChangeLineIndices), independent of the renumbering. Space in the secondary now only ever removes, mirroring how space in the staging view's staged pane unstages. Discarding from the commit (the remove key) makes no sense in the custom-patch preview — it would act on lines shown only as the patch, and space already removes them — so it's disabled there. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| apply.go | ||
| apply_in_reverse.go | ||
| apply_in_reverse_with_conflict.go | ||
| apply_with_modified_file_conflict.go | ||
| apply_with_modified_file_no_conflict.go | ||
| build_from_main_view.go | ||
| build_from_main_view_with_unsupported_pager.go | ||
| build_from_whole_commit_main_view.go | ||
| build_multi_file_from_whole_commit_main_view.go | ||
| copy_renamed_file_diff.go | ||
| discard_lines_from_commit.go | ||
| discard_lines_from_commit_main_view.go | ||
| edit_line_in_patch_building_panel.go | ||
| keep_selection_after_moving_patch_out_main_view.go | ||
| move_range_to_index.go | ||
| move_to_earlier_commit.go | ||
| move_to_earlier_commit_from_added_file.go | ||
| move_to_index.go | ||
| move_to_index_from_added_file_with_conflict.go | ||
| move_to_index_part_of_adjacent_added_lines.go | ||
| move_to_index_partial.go | ||
| move_to_index_with_conflict.go | ||
| move_to_index_with_modified_file.go | ||
| move_to_index_works_even_if_noprefix_is_set.go | ||
| move_to_later_commit.go | ||
| move_to_later_commit_partial_hunk.go | ||
| move_to_new_commit.go | ||
| move_to_new_commit_before.go | ||
| move_to_new_commit_from_added_file.go | ||
| move_to_new_commit_from_deleted_file.go | ||
| move_to_new_commit_in_last_commit_of_stacked_branch.go | ||
| move_to_new_commit_partial_hunk.go | ||
| remove_from_commit.go | ||
| remove_lines_from_main_view_secondary.go | ||
| remove_parts_of_added_file.go | ||
| rename_similarity_threshold_change.go | ||
| renamed_file_partial.go | ||
| renamed_file_whole.go | ||
| reset_patch_built_from_main_view.go | ||
| reset_with_escape.go | ||
| select_all_files.go | ||
| select_direcories_sharing_prefix.go | ||
| specific_selection.go | ||
| start_new_patch.go | ||
| toggle_directory.go | ||
| toggle_range.go | ||