Use ScanLinesAndTruncateWhenLongerThanBuffer instead of bufio.ScanLines

jesseduffield · May 15, 2024 · f69eb6d · f69eb6d
1 parent e0a2d97
commit f69eb6d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/commands/oscommands/cmd_obj_runner.go b/pkg/commands/oscommands/cmd_obj_runner.go
@@ -161,7 +161,7 @@ func (self *cmdObjRunner) RunAndProcessLines(cmdObj ICmdObj, onLine func(line st
  }
 
  scanner := bufio.NewScanner(stdoutPipe)
- scanner.Split(bufio.ScanLines)
+ scanner.Split(utils.ScanLinesAndTruncateWhenLongerThanBuffer(bufio.MaxScanTokenSize))
  if err := cmd.Start(); err != nil {
  return err
  }

diff --git a/pkg/gui/mergeconflicts/find_conflicts.go b/pkg/gui/mergeconflicts/find_conflicts.go
@@ -99,7 +99,7 @@ func FileHasConflictMarkers(path string) (bool, error) {
 // Efficiently scans through a file looking for merge conflict markers. Returns true if it does
 func fileHasConflictMarkersAux(file io.Reader) bool {
  scanner := bufio.NewScanner(file)
- scanner.Split(bufio.ScanLines)
+ scanner.Split(utils.ScanLinesAndTruncateWhenLongerThanBuffer(bufio.MaxScanTokenSize))
  for scanner.Scan() {
  line := scanner.Bytes()
 

diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go
@@ -162,7 +162,7 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p
  done := make(chan struct{})
 
  scanner := bufio.NewScanner(r)
- scanner.Split(bufio.ScanLines)
+ scanner.Split(utils.ScanLinesAndTruncateWhenLongerThanBuffer(bufio.MaxScanTokenSize))
 
  lineChan := make(chan []byte)
  lineWrittenChan := make(chan struct{})