From 46c0f352c40ecb68653421cb178a297acaf00c6d Mon Sep 17 00:00:00 2001
From: Christian Duerr <contact@christianduerr.com>
Date: Thu, 9 Jul 2020 21:45:22 +0000
Subject: Add regex scrollback buffer search

This adds a new regex search which allows searching the entire
scrollback and jumping between matches using the vi mode.

All visible matches should be highlighted unless their lines are
excessively long. This should help with performance since highlighting
is done during render time.

Fixes #1017.
---
 alacritty_terminal/src/grid/tests.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'alacritty_terminal/src/grid/tests.rs')

diff --git a/alacritty_terminal/src/grid/tests.rs b/alacritty_terminal/src/grid/tests.rs
index dbe5f1fc..1ed279a0 100644
--- a/alacritty_terminal/src/grid/tests.rs
+++ b/alacritty_terminal/src/grid/tests.rs
@@ -1,7 +1,6 @@
 //! Tests for the Grid.
 
-use super::{BidirectionalIterator, Grid};
-use crate::grid::GridCell;
+use super::{BidirectionalIterator, Dimensions, Grid, GridCell};
 use crate::index::{Column, Line, Point};
 use crate::term::cell::{Cell, Flags};
 
@@ -171,7 +170,7 @@ fn shrink_reflow() {
 
     grid.resize(true, Line(1), Column(2));
 
-    assert_eq!(grid.len(), 3);
+    assert_eq!(grid.total_lines(), 3);
 
     assert_eq!(grid[2].len(), 2);
     assert_eq!(grid[2][Column(0)], cell('1'));
@@ -198,7 +197,7 @@ fn shrink_reflow_twice() {
     grid.resize(true, Line(1), Column(4));
     grid.resize(true, Line(1), Column(2));
 
-    assert_eq!(grid.len(), 3);
+    assert_eq!(grid.total_lines(), 3);
 
     assert_eq!(grid[2].len(), 2);
     assert_eq!(grid[2][Column(0)], cell('1'));
@@ -224,7 +223,7 @@ fn shrink_reflow_empty_cell_inside_line() {
 
     grid.resize(true, Line(1), Column(2));
 
-    assert_eq!(grid.len(), 2);
+    assert_eq!(grid.total_lines(), 2);
 
     assert_eq!(grid[1].len(), 2);
     assert_eq!(grid[1][Column(0)], cell('1'));
@@ -236,7 +235,7 @@ fn shrink_reflow_empty_cell_inside_line() {
 
     grid.resize(true, Line(1), Column(1));
 
-    assert_eq!(grid.len(), 4);
+    assert_eq!(grid.total_lines(), 4);
 
     assert_eq!(grid[3].len(), 1);
     assert_eq!(grid[3][Column(0)], wrap_cell('1'));
@@ -261,7 +260,7 @@ fn grow_reflow() {
 
     grid.resize(true, Line(2), Column(3));
 
-    assert_eq!(grid.len(), 2);
+    assert_eq!(grid.total_lines(), 2);
 
     assert_eq!(grid[1].len(), 3);
     assert_eq!(grid[1][Column(0)], cell('1'));
@@ -287,7 +286,7 @@ fn grow_reflow_multiline() {
 
     grid.resize(true, Line(3), Column(6));
 
-    assert_eq!(grid.len(), 3);
+    assert_eq!(grid.total_lines(), 3);
 
     assert_eq!(grid[2].len(), 6);
     assert_eq!(grid[2][Column(0)], cell('1'));
@@ -318,7 +317,7 @@ fn grow_reflow_disabled() {
 
     grid.resize(false, Line(2), Column(3));
 
-    assert_eq!(grid.len(), 2);
+    assert_eq!(grid.total_lines(), 2);
 
     assert_eq!(grid[1].len(), 3);
     assert_eq!(grid[1][Column(0)], cell('1'));
@@ -342,7 +341,7 @@ fn shrink_reflow_disabled() {
 
     grid.resize(false, Line(1), Column(2));
 
-    assert_eq!(grid.len(), 1);
+    assert_eq!(grid.total_lines(), 1);
 
     assert_eq!(grid[0].len(), 2);
     assert_eq!(grid[0][Column(0)], cell('1'));
-- 
cgit