DRYer

kittens/diff/mouse.go

@@ -93,19 +93,6 @@ func (self *Handler) finish_mouse_selection(ev *loop.MouseEvent) {
 	self.mouse_selection.Finish()
 }
 
-func format_part_of_line(sgr string, start_x, end_x, y int) string {
-	// DECCARA used to set formatting in specified region using zero based indexing
-	return fmt.Sprintf("\x1b[%d;%d;%d;%d;%s$r", y+1, start_x+1, y+1, end_x+1, sgr)
-}
-
 func (self *Handler) add_mouse_selection_to_line(line string, line_pos ScrollPos, y int) string {
-	ms := &self.mouse_selection
+	return line + self.mouse_selection.LineFormatSuffix(&line_pos, selection_sgr, y)
-	if ms.IsEmpty() {
-		return line
-	}
-	x_start, x_end := self.mouse_selection.LineBounds(&line_pos)
-	if x_start > -1 {
-		line += format_part_of_line(selection_sgr, x_start, x_end, y)
-	}
-	return line
 }

tools/tui/mouse.go

@@ -91,3 +91,16 @@ func (ms *MouseSelection) LineBounds(line_pos LinePos) (start_x, end_x int) {
 	}
 	return -1, -1
 }
+
+func FormatPartOfLine(sgr string, start_x, end_x, y int) string {
+	// DECCARA used to set formatting in specified region using zero based indexing
+	return fmt.Sprintf("\x1b[%d;%d;%d;%d;%s$r", y+1, start_x+1, y+1, end_x+1, sgr)
+}
+
+func (ms *MouseSelection) LineFormatSuffix(line_pos LinePos, sgr string, y int) string {
+	s, e := ms.LineBounds(line_pos)
+	if s > -1 {
+		return FormatPartOfLine(sgr, s, e, y)
+	}
+	return ""
+}