mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
Hunk defaults and wrapping no longer belong to a staging panel. Rename both public keys with automatic migration, and remove panel-era English strings so config, UI, schema, and generated docs describe the surviving interface. Co-Authored-By: GitHub Copilot <copilot@github.com>
164 lines
5.4 KiB
Go
164 lines
5.4 KiB
Go
package main_view
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
// The clipboard is emulated by a file, so that this works on CI too. A copy says so
|
|
// with a toast, which the harness wants acknowledged before the next keypress.
|
|
func expectClipboard(t *TestDriver, matcher *TextMatcher) {
|
|
defer t.Shell().DeleteFile("clipboard")
|
|
|
|
t.ExpectToast(Equals("Selected diff lines copied to clipboard"))
|
|
t.FileSystem().FileContent("clipboard", matcher)
|
|
}
|
|
|
|
var CopySelectedDiffLines = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Copy the selected diff lines from the focused main view, as the diff reads rather than as the renderer drew it",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(cfg *config.AppConfig) {
|
|
cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true
|
|
// Emulate the clipboard by writing to a file.
|
|
cfg.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard"
|
|
// A renderer that decorates every line of a diff's body, so that what is on
|
|
// screen is not what the diff says. It announces the metadata protocol, so that
|
|
// its output is taken at its word rather than replaced by git's own; and it
|
|
// reads the +/- column, so it wants its input uncoloured.
|
|
cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{
|
|
{
|
|
Command: `printf '\033]1717;1\007'; ` +
|
|
`awk '/^@@/ { body = 1 } body && /^[-+ ]/ { print $0 " <<<"; next } { print }'`,
|
|
ColorArg: "never",
|
|
},
|
|
}
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n")
|
|
shell.Commit("one")
|
|
shell.UpdateFileAndAdd("file1", "one\nTWO\nthree\n")
|
|
shell.Commit("two")
|
|
|
|
shell.UpdateFile("file1", "one\nTWO\nADD1\nADD2\nthree\n")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Press(keys.Universal.FocusMainView)
|
|
|
|
t.Views().Main().
|
|
IsFocused().
|
|
SelectedLines(
|
|
Contains("+ADD1 <<<"),
|
|
Contains("+ADD2 <<<"),
|
|
).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
// The renderer's decoration is nowhere in what was copied, and a selection that
|
|
// is all additions loses its '+' column, ready to be pasted into code.
|
|
expectClipboard(t, Equals("ADD1\nADD2\n"))
|
|
|
|
// A selection reaching up into the hunk header takes the header with it, and what
|
|
// comes out is a patch fragment rather than lines of code, so the columns stay.
|
|
t.Views().Main().
|
|
IsFocused().
|
|
Press(keys.Main.ToggleSelectHunk).
|
|
SelectedLines(
|
|
Contains("+ADD1 <<<"),
|
|
).
|
|
Press(keys.Universal.ToggleRangeSelect).
|
|
Press(keys.Universal.PrevItem).
|
|
Press(keys.Universal.PrevItem).
|
|
Press(keys.Universal.PrevItem).
|
|
SelectedLines(
|
|
Contains("@@ -1,3 +1,5 @@"),
|
|
Contains(" one <<<"),
|
|
Contains(" TWO <<<"),
|
|
Contains("+ADD1 <<<"),
|
|
).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
expectClipboard(t, Equals("@@ -1,3 +1,5 @@\n one\n TWO\n+ADD1\n"))
|
|
|
|
// A file header is taken whole, however much of it is selected: the rendering may
|
|
// show it as any number of rows, none of which is a line of the file.
|
|
t.Views().Main().
|
|
IsFocused().
|
|
Press(keys.Universal.PrevItem).
|
|
SelectedLines(
|
|
Contains("+++ b/file1"),
|
|
Contains("@@ -1,3 +1,5 @@"),
|
|
Contains(" one <<<"),
|
|
Contains(" TWO <<<"),
|
|
Contains("+ADD1 <<<"),
|
|
).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
expectClipboard(t, MatchesRegexp(
|
|
`\Adiff --git a/file1 b/file1\nindex [0-9a-f]+\.\.[0-9a-f]+ 100644\n`+
|
|
`--- a/file1\n\+\+\+ b/file1\n@@ -1,3 \+1,5 @@\n one\n TWO\n\+ADD1\n\z`))
|
|
|
|
// A commit's diff is copied the same way, through the panel that produced it.
|
|
t.Views().Commits().
|
|
Focus().
|
|
NavigateToLine(Contains("two")).
|
|
Press(keys.Universal.FocusMainView)
|
|
|
|
t.Views().Main().
|
|
IsFocused().
|
|
SelectedLines(
|
|
Contains("-two <<<"),
|
|
Contains("+TWO <<<"),
|
|
).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
// Both kinds of line are in the selection, so the columns stay: what comes out
|
|
// is the diff itself.
|
|
expectClipboard(t, Equals("-two\n+TWO\n"))
|
|
|
|
// What a diff view shows above the diff is part of no file's diff, a commit's
|
|
// message among it, so a selection of those rows is copied as it stands on screen.
|
|
t.Views().Main().
|
|
IsFocused().
|
|
Press(keys.Main.ToggleSelectHunk).
|
|
NavigateToLine(Contains(" two")).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
expectClipboard(t, Equals(" two\n"))
|
|
|
|
// A selection reaching from there into the diff takes the screen's rows down to
|
|
// the first file and the diff's own from there on.
|
|
t.Views().Main().
|
|
IsFocused().
|
|
Press(keys.Universal.ToggleRangeSelect).
|
|
NavigateToLine(Contains("-two <<<")).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
expectClipboard(t, MatchesRegexp(
|
|
`\A {4}two\n---\n file1 \|[^\n]*\n 1 file changed[^\n]*\n\n`+
|
|
`diff --git a/file1 b/file1\nindex [0-9a-f]+\.\.[0-9a-f]+ 100644\n`+
|
|
`--- a/file1\n\+\+\+ b/file1\n@@ -1,3 \+1,3 @@\n one\n-two\n\z`))
|
|
|
|
// The pane showing the custom patch is a diff too, of the patch's own lines.
|
|
t.Views().Main().
|
|
Press(keys.Main.ToggleSelectHunk).
|
|
SelectedLines(
|
|
Contains("-two <<<"),
|
|
Contains("+TWO <<<"),
|
|
).
|
|
PressPrimaryAction().
|
|
Press(keys.Universal.TogglePanel)
|
|
|
|
t.Views().Secondary().
|
|
IsFocused().
|
|
SelectedLines(
|
|
Contains("-two <<<"),
|
|
Contains("+TWO <<<"),
|
|
).
|
|
Press(keys.Universal.CopyToClipboard)
|
|
|
|
expectClipboard(t, Equals("-two\n+TWO\n"))
|
|
},
|
|
})
|