Patchwork [1,of,5] grep: refactor loop that yields matched text with label

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 25, 2016, 3:24 p.m.
Message ID <b1dc2acf966186db6f82.1472138694@mimosa>
Download mbox | patch
Permalink /patch/16412/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 25, 2016, 3:24 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1471496605 -32400
#      Thu Aug 18 14:03:25 2016 +0900
# Node ID b1dc2acf966186db6f82017001d6d449fec5021a
# Parent  b1f69dbdd76be170429185c3b0f50027f55e4f07
grep: refactor loop that yields matched text with label

As preparation for formatter support, this and the next patch split
linestate.__iter__() into two functions, line scanner and displayer.

New code uses regexp.search(str, pos) in place of regexp.search(substr),
which appears to fix a bug of highlighting.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4345,19 +4345,24 @@  def grep(ui, repo, pattern, *pats, **opt
         def __eq__(self, other):
             return self.line == other.line
 
+        def findpos(self):
+            """Iterate all (start, end) indices of matches"""
+            yield self.colstart, self.colend
+            p = self.colend
+            while p < len(self.line):
+                m = regexp.search(self.line, p)
+                if not m:
+                    break
+                yield m.span()
+                p = m.end()
+
         def __iter__(self):
-            yield (self.line[:self.colstart], '')
-            yield (self.line[self.colstart:self.colend], 'grep.match')
-            rest = self.line[self.colend:]
-            while rest != '':
-                match = regexp.search(rest)
-                if not match:
-                    yield (rest, '')
-                    break
-                mstart, mend = match.span()
-                yield (rest[:mstart], '')
-                yield (rest[mstart:mend], 'grep.match')
-                rest = rest[mend:]
+            p = 0
+            for s, e in self.findpos():
+                yield self.line[p:s], ''
+                yield self.line[s:e], 'grep.match'
+                p = e
+            yield self.line[p:], ''
 
     matches = {}
     copies = {}
diff --git a/tests/test-grep.t b/tests/test-grep.t
--- a/tests/test-grep.t
+++ b/tests/test-grep.t
@@ -111,6 +111,12 @@  follow
   color:2:-:orange
   color:1:+:orange
 
+test substring match: '^' should only match at the beginning
+
+  $ hg grep '^.' --config extensions.color= --color debug
+  [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
+  [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
+  [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
 
 match in last "line" without newline