72 73lineIdx++ 74}          75 76for _, line := range self.patch.header { 77// always passing false for 'included' here because header lines are not part of the patch 
1 hits78appendLine(self.formatLineAux(line, theme.DefaultTextColor.SetBold(), false)) 
1 hits79} 80 81for _, hunk := range self.patch.hunks { 82appendLine( 83self.formatLineAux( 
1 hits84hunk.formatHeaderStart(), 85style.FgCyan, 86false, 
1 hits87) + 88// we're splitting the line into two parts: the diff header and the context 89// We explicitly pass 'included' as false for both because these are not part 
1 hits90// of the actual patch 
1 hits91self.formatLineAux( 92hunk.headerContext, 93theme.DefaultTextColor,

96) 97 98for _, line := range hunk.bodyLines { 99style := self.patchLineStyle(line) 
1 hits100if line.IsChange() { 
2 hits101appendLine(self.formatLine(line.Content, style, lineIdx)) 
1 hits102} else { 
2 hits103appendLine(self.formatLineAux(line.Content, style, false)) 
1 hits104} 
1 hits105} 106} 

115return -1 116} 117 118// Returns the patch line index of the next change (i.e. addition or deletion) 119// that matches the same "included" state, given the includedLines. If you don't 120// care about included states, pass nil for includedLines and false for included. 121func (self *Patch) GetNextChangeIdxOfSameIncludedState(idx int, includedLines []int, included bool) (int, bool) { 
1 hits122idx = lo.Clamp(idx, 0, self.LineCount()-1) 123 124lines := self.Lines() 125 126isMatch := func(i int, line *PatchLine) bool { 
2 hits127sameIncludedState := lo.Contains(includedLines, i) == included 
1 hits128return line.IsChange() && sameIncludedState 
1 hits129} 
1 hits130 131for i, line := range lines[idx:] { 132if isMatch(i+idx, line) { 
2 hits133return i + idx, true 
1 hits134} 135} 

138// return the index of the last change 139for i := len(lines) - 1; i >= 0; i-- { 140line := lines[i] 141if isMatch(i, line) { 
2 hits142return i, true 
1 hits143} 144} 145 146return 0, false 
Not covered147} 148 149// Returns the patch line index of the next change (i.e. addition or deletion). 150func (self *Patch) GetNextChangeIdx(idx int) int { 
1 hits151result, _ := self.GetNextChangeIdxOfSameIncludedState(idx, nil, false) 
1 hits152return result 
1 hits153} 154 155// Returns the length of the patch in lines

124return nil 125} 126         127func (p *PatchBuilder) getFileInfo(filename string) (*fileInfo, error) { 128info, ok := p.fileInfoMap[filename] 129if ok {

144return info, nil 145} 146 147func (p *PatchBuilder) AddFileLineRange(filename string, lineIndices []int) error { 
1 hits148info, err := p.getFileInfo(filename) 149if err != nil { 150return err 151} 152info.mode = PART 153info.includedLineIndices = lo.Union(info.includedLineIndices, lineIndices) 
1 hits154 155return nil 156} 157 158func (p *PatchBuilder) RemoveFileLineRange(filename string, lineIndices []int) error { 
Not covered159info, err := p.getFileInfo(filename) 160if err != nil { 161return err 162} 163info.mode = PART 164info.includedLineIndices, _ = lo.Difference(info.includedLineIndices, lineIndices) 
Not covered165if len(info.includedLineIndices) == 0 { 166p.removeFile(info) 167}

18Content string // something like '+ hello' (note the first character is not removed) 19} 20 21func (self *PatchLine) IsChange() bool { 
1 hits22return self.Kind == ADDITION || self.Kind == DELETION 23} 

126self.context().GetMutex().Lock() 127defer self.context().GetMutex().Unlock() 128  129filename := self.c.Contexts().CommitFiles.GetSelectedPath() 130if filename == "" { 131return nil

133 134state := self.context().GetState() 135 136// Get added/deleted lines in the selected patch range 
1 hits137lineIndicesToToggle := state.ChangeLinesInSelectedPatchRange() 
1 hits138if len(lineIndicesToToggle) == 0 { 
1 hits139// Only context lines or header lines selected, so nothing to do 
Not covered140return nil 
Not covered141} 
Not covered142 143includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(filename) 144if err != nil { 145return err 146} 147 148toggleFunc := self.c.Git().Patch.PatchBuilder.AddFileLineRange 
1 hits149firstSelectedChangeLineIsStaged := lo.Contains(includedLineIndices, lineIndicesToToggle[0]) 
1 hits150if firstSelectedChangeLineIsStaged { 
1 hits151toggleFunc = self.c.Git().Patch.PatchBuilder.RemoveFileLineRange 152} 153 154// add range of lines to those set for the file 155if err := toggleFunc(filename, lineIndicesToToggle); err != nil { 
1 hits  156// might actually want to return an error here 157self.c.Log.Error(err) 158}

161state.SetLineSelectMode() 162} 163 164state.SelectNextStageableLineOfSameIncludedState(self.context().GetIncludedLineIndices(), firstSelectedChangeLineIsStaged) 
1 hits165 
1 hits166return nil 167} 

282return s.patchLineIndices[start], s.patchLineIndices[end] 283} 284 285// Returns the line indices of the selected patch range that are changes (i.e. additions or deletions) 286func (s *State) ChangeLinesInSelectedPatchRange() []int { 
1 hits287viewStart, viewEnd := s.SelectedViewRange() 
1 hits288patchStart, patchEnd := s.patchLineIndices[viewStart], s.patchLineIndices[viewEnd] 
1 hits289lines := s.patch.Lines() 
1 hits290indices := []int{} 
1 hits291for i := patchStart; i <= patchEnd; i++ { 
2 hits292if lines[i].IsChange() { 
2 hits293indices = append(indices, i) 
1 hits294} 
1 hits295} 296return indices 
1 hits297} 298 299func (s *State) CurrentLineNumber() int { 300return s.patch.LineNumberOfLine(s.patchLineIndices[s.selectedLineIdx]) 301}

338view.Wrap, view.Editable, strings.TrimSuffix(diff, "\n"), view.InnerWidth(), view.TabWidth) 339return viewLineIndices, patchLineIndices 340} 341 342func (s *State) SelectNextStageableLineOfSameIncludedState(includedLines []int, included bool) { 
1 hits343_, lastLineIdx := s.SelectedPatchRange() 
1 hits344patchLineIdx, found := s.patch.GetNextChangeIdxOfSameIncludedState(lastLineIdx+1, includedLines, included) 
1 hits345if found { 
2 hits346s.SelectLine(s.viewLineIndices[patchLineIdx]) 
1 hits347} 
1 hits348}

66Contains(` 1f`), 67). 68PressPrimaryAction().   69SelectedLines( 70Contains(`@@ -17,9 +17,9 @@`), 
1 hits71Contains(` 1q`), 
1 hits72Contains(` 1r`), 
1 hits73Contains(` 1s`), 
1 hits74Contains(`-1t`), 
1 hits75Contains(`-1u`), 
1 hits76Contains(`-1v`), 
1 hits77Contains(`+tt`), 
1 hits78Contains(`+uu`), 
1 hits79Contains(`+vv`), 
1 hits80Contains(` 1w`), 
1 hits81Contains(` 1x`), 
1 hits82Contains(` 1y`), 
1 hits83). 84Tap(func() { 85t.Views().Information().Content(Contains("Building patch"))

108Contains("+2a"), 109). 110PressPrimaryAction(). 111SelectedLines( 
1 hits112Contains("+2b"), 
1 hits113). 
1 hits114NavigateToLine(Contains("+2c")). 115Press(keys.Universal.ToggleRangeSelect). 116NavigateToLine(Contains("+2e")). 117PressPrimaryAction(). 118SelectedLines( 
1 hits119Contains("+2f"), 
1 hits120). 
1 hits121NavigateToLine(Contains("+2g")). 122PressPrimaryAction(). 123SelectedLines( 
1 hits124Contains("+2h"), 
1 hits125). 
1 hits126Tap(func() { 127t.Views().Information().Content(Contains("Building patch"))