← all fixtures

go-jesseduffield-lazygit-add-two-lines

Go View before/after files on GitHub Upstream commit jesseduffield-lazygit.git@6cbc1e0 pkg/integration/tests/interactive_rebase/shared.go
Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

…lines 1–5 unchanged (5 lines)
6
7func handleConflictsFromSwap(t *TestDriver, expectedCommand string) {
8 t.Common().AcknowledgeConflicts()
9
10 t.Views().Commits().
11 Lines(
12 Contains("pick").Contains("commit two"),
13 Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"),
14 Contains("commit one"),
15 )
16
17 t.Views().Files().
18 IsFocused().
19 Lines(
20 Contains("UU myfile"),
…lines 21–76 unchanged (56 lines)

After

…lines 1–5 unchanged (5 lines)
6
7func handleConflictsFromSwap(t *TestDriver, expectedCommand string) {
8 t.Common().AcknowledgeConflicts()
9
10 t.Views().Commits().
11 Lines(
12 Contains("--- Pending rebase todos ---"),
13 Contains("pick").Contains("commit two"),
14 Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"),
15 Contains("--- Commits ---"),
16 Contains("commit one"),
17 )
18
19 t.Views().Files().
20 IsFocused().
21 Lines(
…lines 22–78 unchanged (57 lines)

Before

source_file
package_clause
package "package"
package_identifier "interactive_rebase"
import_declaration
import "import"
import_spec_list
( "("
import_spec
dot
. "."
interpreted_string_literal
" "\""
interpreted_string_literal_content "github.com/jesseduffield/lazygit/pkg/integration/components"
" "\""
) ")"
function_declaration
func "func"
identifier "handleConflictsFromSwap"
parameter_list
( "("
parameter_declaration
identifier "t"
pointer_type
* "*"
type_identifier "TestDriver"
, ","
parameter_declaration
identifier "expectedCommand"
type_identifier "string"
) ")"
block
{ "{"
statement_list
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "AcknowledgeConflicts"
argument_list
( "("
) ")"
expression_statement
call_expression
selector_expression
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Views"
argument_list
( "("
) ")"
. "."
field_identifier "Commits"
argument_list
( "("
) ")"
. "."
field_identifier "Lines"
argument_list
( "("
call_expression
selector_expression
call_expression
identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "pick"
" "\""
) ")"
. "."
field_identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "commit two"
" "\""
) ")"
, ","
call_expression
selector_expression
call_expression
identifier "Contains"
argument_list
( "("
identifier "expectedCommand"
) ")"
. "."
field_identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "<-- CONFLICT --- commit three"
" "\""
) ")"
, ","
call_expression
identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "commit one"
" "\""
) ")"
, ","
) ")"
expression_statement (+47 nodes collapsed)
expression_statement (+94 nodes collapsed)
comment "// pick \"three\""
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "ContinueOnConflictsResolved"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "rebase"
" "\""
) ")"
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "AcknowledgeConflicts"
argument_list
( "("
) ")"
expression_statement (+47 nodes collapsed)
expression_statement (+94 nodes collapsed)
comment "// pick \"two\""
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "ContinueOnConflictsResolved"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "rebase"
" "\""
) ")"
expression_statement (+192 nodes collapsed)
} "}"

After

source_file
package_clause
package "package"
package_identifier "interactive_rebase"
import_declaration
import "import"
import_spec_list
( "("
import_spec
dot
. "."
interpreted_string_literal
" "\""
interpreted_string_literal_content "github.com/jesseduffield/lazygit/pkg/integration/components"
" "\""
) ")"
function_declaration
func "func"
identifier "handleConflictsFromSwap"
parameter_list
( "("
parameter_declaration
identifier "t"
pointer_type
* "*"
type_identifier "TestDriver"
, ","
parameter_declaration
identifier "expectedCommand"
type_identifier "string"
) ")"
block
{ "{"
statement_list
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "AcknowledgeConflicts"
argument_list
( "("
) ")"
expression_statement
call_expression
selector_expression
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Views"
argument_list
( "("
) ")"
. "."
field_identifier "Commits"
argument_list
( "("
) ")"
. "."
field_identifier "Lines"
argument_list
( "("
call_expression
identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "--- Pending rebase todos ---"
" "\""
) ")"
, ","
call_expression
selector_expression
call_expression
identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "pick"
" "\""
) ")"
. "."
field_identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "commit two"
" "\""
) ")"
, ","
call_expression
selector_expression
call_expression
identifier "Contains"
argument_list
( "("
identifier "expectedCommand"
) ")"
. "."
field_identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "<-- CONFLICT --- commit three"
" "\""
) ")"
, ","
call_expression
identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "--- Commits ---"
" "\""
) ")"
, ","
call_expression
identifier "Contains"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "commit one"
" "\""
) ")"
, ","
) ")"
expression_statement (+47 nodes collapsed)
expression_statement (+94 nodes collapsed)
comment "// pick \"three\""
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "ContinueOnConflictsResolved"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "rebase"
" "\""
) ")"
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "AcknowledgeConflicts"
argument_list
( "("
) ")"
expression_statement (+47 nodes collapsed)
expression_statement (+94 nodes collapsed)
comment "// pick \"two\""
expression_statement
call_expression
selector_expression
call_expression
selector_expression
identifier "t"
. "."
field_identifier "Common"
argument_list
( "("
) ")"
. "."
field_identifier "ContinueOnConflictsResolved"
argument_list
( "("
interpreted_string_literal
" "\""
interpreted_string_literal_content "rebase"
" "\""
) ")"
expression_statement (+192 nodes collapsed)
} "}"