mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-11 08:06:25 -04:00
227081f1d1
This is useful when cancelling out of the commit panel mid-sentence (after
having typed the space for the next word); when entering the commit message
panel again, the space was gone and you had to type it again. Small thing, but
it just seems better to resume the panel in exactly the state that you left it
in. (Which we actually don't do; we don't remember the cursor position, or which
of the subject/description panels was active. That would be a separate
improvement.)
The save path and the load path used to be asymmetric. On save, the textarea
getters applied strings.TrimSpace, which stripped any leading blank lines, a
trailing newline after the cursor, or indentation on the very first line of the
description — all of which are legitimate user content. On load,
SplitCommitMessageAndDescription did TrimSpace on the description as well, and
the preserved message was routed through that same git-format split because
HandleCommitPress passed it as OpenCommitMessagePanel's InitialMessage. The
result: every round-trip through "escape and reopen" silently mutated the
message.
The fix is to treat our own preservation file as its own format, distinct from
git's canonical "summary\n\nbody" format:
- The textarea getters return raw content. strings.TrimSpace moves to the one
place that still needs it: the empty-summary check in HandleCommitConfirm (git
itself strips trailing whitespace and blank lines, so no pre-trim is needed
before -m).
- SplitPreservedCommitMessage / SetPreservedMessageInView split on the single
"\n" our Join uses, without any trimming — truly lossless.
- SplitCommitMessageAndDescription keeps its git-format behavior but replaces
TrimSpace with TrimPrefix("\n"), so it strips only the blank-line separator
and leaves body indentation intact.
- HandleCommitPress now mirrors HandleWIPCommitPress: it no longer passes the
preserved message as InitialMessage. OpenCommitMessagePanel resolves the
preserved content itself, uses it for display via the preservation-format
setter, and stores it as the initial message so the close-time "did the user
change anything?" check still correctly detects a cleared panel.
- GetInitialMessage no longer trims. With raw getters on both sides of the
comparison, trimming here caused spurious non-matches (e.g. for preserved
content with trailing whitespace). The original motivation — matching a
"WIP: " prefix with trailing space — works unchanged.
- UpdateCommitPanelView becomes dead code and is removed; its one remaining
caller (history cycling, always git-format) goes directly through
SetMessageAndDescriptionInView.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
||
|---|---|---|
| .. | ||
| add_co_author.go | ||
| add_co_author_range.go | ||
| add_co_author_while_committing.go | ||
| amend.go | ||
| amend_when_there_are_conflicts_and_amend.go | ||
| amend_when_there_are_conflicts_and_cancel.go | ||
| amend_when_there_are_conflicts_and_continue.go | ||
| auto_wrap_message.go | ||
| checkout.go | ||
| checkout_file_from_commit.go | ||
| checkout_file_from_range_selection_of_commits.go | ||
| checkout_file_with_local_modifications.go | ||
| commit.go | ||
| commit_multiline.go | ||
| commit_skip_hooks.go | ||
| commit_switch_to_editor.go | ||
| commit_switch_to_editor_skip_hooks.go | ||
| commit_wip_with_prefix.go | ||
| commit_with_fallthrough_prefix.go | ||
| commit_with_global_prefix.go | ||
| commit_with_non_matching_branch_name.go | ||
| commit_with_prefix.go | ||
| copy_author_to_clipboard.go | ||
| copy_message_body_to_clipboard.go | ||
| copy_tag_to_clipboard.go | ||
| create_amend_commit.go | ||
| create_fixup_commit_in_branch_stack.go | ||
| create_tag.go | ||
| disable_copy_commit_message_body.go | ||
| discard_old_file_changes.go | ||
| discard_submodule_changes.go | ||
| do_not_show_branch_marker_for_head_commit.go | ||
| fail_hooks_then_commit_no_hooks.go | ||
| find_base_commit_for_fixup.go | ||
| find_base_commit_for_fixup_disregard_fixups_for_same_base_commit.go | ||
| find_base_commit_for_fixup_disregard_main_branch.go | ||
| find_base_commit_for_fixup_only_added_lines.go | ||
| find_base_commit_for_fixup_warning_for_added_lines.go | ||
| highlight.go | ||
| history.go | ||
| history_complex.go | ||
| new_branch.go | ||
| paste_commit_message.go | ||
| paste_commit_message_over_existing.go | ||
| preserve_commit_message.go | ||
| preserve_commit_message_whitespace.go | ||
| reset_author.go | ||
| reset_author_range.go | ||
| revert.go | ||
| revert_merge.go | ||
| revert_with_conflict_multiple_commits.go | ||
| revert_with_conflict_single_commit.go | ||
| reword.go | ||
| search.go | ||
| set_author.go | ||
| set_author_range.go | ||
| shared.go | ||
| stage_range_of_lines.go | ||
| staged.go | ||
| staged_without_hooks.go | ||
| unstaged.go | ||