Documentation ¶
Index ¶
- func ColoredConflictFile(content string, state *State, hasFocus bool) string
- type LineType
- type Selection
- type State
- func (s *State) ContentAfterConflictResolve(path string, selection Selection) (bool, string, error)
- func (s *State) GetConflictMiddle() int
- func (s *State) IsFinalConflict() bool
- func (s *State) NoConflicts() bool
- func (s *State) PopFileSnapshot() (string, bool)
- func (s *State) PushFileSnapshot(content string)
- func (s *State) Reset()
- func (s *State) SelectNextConflict()
- func (s *State) SelectNextConflictHunk()
- func (s *State) SelectPrevConflict()
- func (s *State) SelectPrevConflictHunk()
- func (s *State) Selection() Selection
- func (s *State) SetConflictsFromCat(cat string)
Constants ¶
This section is empty.
Variables ¶
This section is empty.
Functions ¶
Types ¶
type LineType ¶ added in v0.28.2
type LineType int
LineType tells us whether a given line is a start/middle/end marker of a conflict, or if it's not a marker at all
type State ¶ added in v0.28.1
type State struct { sync.Mutex // this allows us to undo actions EditHistory *stack.Stack // contains filtered or unexported fields }
func (*State) ContentAfterConflictResolve ¶ added in v0.28.1
func (*State) GetConflictMiddle ¶ added in v0.28.1
func (*State) IsFinalConflict ¶ added in v0.28.1
func (*State) NoConflicts ¶ added in v0.28.1
func (*State) PopFileSnapshot ¶ added in v0.28.1
func (*State) PushFileSnapshot ¶ added in v0.28.1
func (*State) SelectNextConflict ¶ added in v0.28.1
func (s *State) SelectNextConflict()
func (*State) SelectNextConflictHunk ¶ added in v0.30.1
func (s *State) SelectNextConflictHunk()
func (*State) SelectPrevConflict ¶ added in v0.28.1
func (s *State) SelectPrevConflict()
func (*State) SelectPrevConflictHunk ¶ added in v0.30.1
func (s *State) SelectPrevConflictHunk()
func (*State) SetConflictsFromCat ¶ added in v0.28.1
Click to show internal directories.
Click to hide internal directories.