Use more accurate matching in fix_gn_headers.py

build/fix_gn_headers.py

 #!/usr/bin/env python
 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Fix header files missing in GN.
 
 This script takes the missing header files from check_gn_headers.py, and
 try to fix them by adding them to the GN files.
 Manual cleaning up is likely required afterwards.
 """
 
 import argparse
 import os
 import re
 import subprocess
 import sys
 
 
+def GitGrep(pattern):
+  p = subprocess.Popen(
+      ['git', 'grep', '-En', pattern, '--', '*.gn', '*.gni'],
+      stdout=subprocess.PIPE)
+  out, _ = p.communicate()
+  return out, p.returncode
+
+
+def ValidMatches(basename, cc, grep_lines):
+  """Filter out 'git grep' matches with header files already."""
+  matches = []
+  for line in grep_lines:
+    gnfile, linenr, contents = line.split(':')
+    linenr = int(linenr)
+    new = re.sub(cc, basename, contents)
+    lines = open(gnfile).read().splitlines()
+    assert contents in lines[linenr - 1]
+    # Skip if it's already there. It could be before or after the match.
+    if lines[linenr] == new:
+      continue
+    if lines[linenr - 2] == new:
+      continue
+    print '    ', gnfile, linenr, new
+    matches.append((gnfile, linenr, new))
+  return matches
+
+
 def AddHeadersNextToCC(headers, skip_ambiguous=True):
   """Add header files next to the corresponding .cc files in GN files.
 
   When skip_ambiguous is True, skip if multiple .cc files are found.
   Returns unhandled headers.
 
   Manual cleaning up is likely required, especially if not skip_ambiguous.
   """
   edits = {}
   unhandled = []
   for filename in headers:
     filename = filename.strip()
     if not (filename.endswith('.h') or filename.endswith('.hh')):
       continue
     basename = os.path.basename(filename)
     print filename
     cc = r'\b' + os.path.splitext(basename)[0] + r'\.(cc|cpp|mm)\b'
-    p = subprocess.Popen(
-        ['git', 'grep', '-En', cc + '"', '--', '*.gn', '*.gni'],
-        stdout=subprocess.PIPE)
-    out, _ = p.communicate()
-    if p.returncode != 0 or not out:
+    out, returncode = GitGrep('(/|")' + cc + '"')
+    if returncode != 0 or not out:
       unhandled.append(filename)
       continue
 
-    if skip_ambiguous and len(out.splitlines()) > 1:
+    matches = ValidMatches(basename, cc, out.splitlines())
+
+    if len(matches) == 0:
+      continue
+    if len(matches) > 1:
       print '\n[WARNING] Ambiguous matching for', filename
-      print out
-      continue
+      for i in enumerate(matches, 1):
+        print '%d: %s' % (i[0], i[1])
+      print
+      if skip_ambiguous:
+        continue
 
-    for gnline in out.splitlines():
-      gnfile, linenr, contents = gnline.split(':')
-      linenr = int(linenr)
-      new = re.sub(cc, basename, contents)
-      lines = open(gnfile).read().splitlines()
-      # Skip if it's already there. It could be before or after the match.
-      if lines[linenr] == new:
+      picked = raw_input('Pick the matches ("2,3" for multiple): ')
+      try:
+        matches = [matches[int(i) - 1] for i in picked.split(',')]
+      except (ValueError, IndexError):
         continue
-      if lines[linenr - 2] == new:
-        continue
+
+    for match in matches:
+      gnfile, linenr, new = match
       print '  ', gnfile, linenr, new
       edits.setdefault(gnfile, {})[linenr] = new
 
   for gnfile in edits:
     lines = open(gnfile).read().splitlines()
     for l in sorted(edits[gnfile].keys(), reverse=True):
       lines.insert(l, edits[gnfile][l])
     open(gnfile, 'w').write('\n'.join(lines) + '\n')
 
   return unhandled
@@ skipping 46 matching lines @@
 
   if args.prefix:
     headers = [i for i in headers if i.startswith(args.prefix)]
 
   unhandled = AddHeadersNextToCC(headers)
   AddHeadersToSources(unhandled)
 
 
 if __name__ == '__main__':
   sys.exit(main())