Merge pull request #9 from chromium/kythe-migration

Catch up with backend changes due to Kythe migration

Author: asankah

autoload/crcs.vim

@@ -100,9 +100,10 @@ function! crcs#SetupCodesearchBuffer(bufname, dirname, buftype)
   endif
 
   if a:buftype ==# 'call'
-    syn region csNode concealends matchgroup=csConceal start=/\^N{/ end=/}N_/ contains=csNode,csExpander,csSymbol,csMarkedupCode nextgroup=csExpander transparent
+    syn region csNode concealends matchgroup=csConceal start=/\^N{/ end=/}N_/ contains=csNode,csExpander,csSymbol,csMarkedupCode,csFilename nextgroup=csExpander transparent
     syn match csExpander /\[[-+\*]\]/ nextgroup=csSymbol
-    syn region csSymbol concealends matchgroup=csConceal start=/\^S{/ end=/}S_/ contained
+    syn region csSymbol concealends matchgroup=csConceal start=/\^S{/ end=/}S_/ nextgroup=csFilename contained
+    syn region csFilename concealends matchgroup=csConceal start=/\^F{/ end=/}F_/ contains=NONE nextgroup=csMarkedupCode
 
     hi def link csExpander Special
     hi def link csSymbol Directory

render/render.py

@@ -94,7 +94,10 @@ def JumpTargetAt(self, line, column):
     line -= 1
     column -= 1
     if line not in self.jump_map_:
-      line = max([l for l in self.jump_map_.keys() if l < line])
+      candidates = [l for l in self.jump_map_.keys() if l < line] 
+      if len(candidates) == 0:
+          return None
+      line = max(candidates)
     filename, target_line, offset_column = self.jump_map_[line]
     if offset_column < column:
       overhead = CountBlockMarkupOverhead(
@@ -285,14 +288,14 @@ def __init__(self, name, order):
       self.bin = []
 
   collectors = {
-      cs.EdgeEnumKind.HAS_DEFINITION: Bin('Definition', 1),
-      cs.EdgeEnumKind.HAS_DECLARATION: Bin('Declaration', 2),
-      cs.EdgeEnumKind.CALLED_AT: Bin('Calls', 3),
-      cs.EdgeEnumKind.INSTANTIATED_AT: Bin('Instantiations', 4),
-      cs.EdgeEnumKind.OVERRIDDEN_BY: Bin('Overridden by', 5),
-      cs.EdgeEnumKind.OVERRIDES: Bin('Overrides', 6),
-      cs.EdgeEnumKind.EXTENDED_BY: Bin('Extended by', 7),
-      cs.EdgeEnumKind.EXTENDS: Bin('Extends', 8),
+      cs.KytheXrefKind.DEFINITION: Bin('Definition', 1),
+      cs.KytheXrefKind.DECLARATION: Bin('Declaration', 2),
+      cs.KytheXrefKind.CALLED_BY: Bin('Calls', 3),
+      cs.KytheXrefKind.INSTANTIATION: Bin('Instantiations', 4),
+      cs.KytheXrefKind.OVERRIDDEN_BY: Bin('Overridden by', 5),
+      cs.KytheXrefKind.OVERRIDES: Bin('Overrides', 6),
+      cs.KytheXrefKind.EXTENDED_BY: Bin('Extended by', 7),
+      cs.KytheXrefKind.EXTENDS: Bin('Extends', 8),
 
       # Everything else.
       0: Bin('References', 100)
@@ -345,10 +348,10 @@ def RenderNode(mapper, node, level):
   with TaggedBlock(mapper, 'N'):
     # Rendered text looks like:
     #
-    # [-] namespace::Bar()
+    # [-] namespace::Bar() (filename.cc)
     #     38   InvokeBaz(1, 2, true);
     #
-    #     [+] Quux()
+    #     [+] Quux() (filename.cc)
     #         10   Bar()
     #
 
@@ -364,15 +367,19 @@ def RenderNode(mapper, node, level):
         indent=' ' * (level * NODE_INDENT), expander=expander))
 
     # Symbol
-    with TaggedBlock(mapper, 'S'):
-      if hasattr(node, 'call_scope_range'):
-        start_line = node.call_scope_range.start_line
-      elif hasattr(node, 'call_site_range'):
-        start_line = node.call_site_range.start_line
-      else:
-        start_line = 1
-      mapper.SetTargetForPos(node.file_path, start_line)
-      mapper.write(AbbreviateCppSymbol(node.display_name))
+    if hasattr(node, 'file_path') and hasattr(node, 'identifier'):
+        with TaggedBlock(mapper, 'S'):
+          if hasattr(node, 'call_scope_range'):
+            start_line = node.call_scope_range.start_line
+          elif hasattr(node, 'call_site_range'):
+            start_line = node.call_site_range.start_line
+          else:
+            start_line = 1
+          mapper.SetTargetForPos(node.file_path, start_line)
+          mapper.write(AbbreviateCppSymbol(node.identifier))
+        mapper.write(' ')
+        with TaggedBlock(mapper, 'F'):
+            mapper.write(node.file_path)
 
     # Render snippet
     if hasattr(node, 'snippet') and hasattr(node, 'snippet_file_path'):

third_party/codesearch-py

@@ -20,12 +20,13 @@
 
 try:
   from codesearch import CodeSearch, CompoundRequest, SearchRequest, \
-          XrefSearchRequest, CallGraphRequest, EdgeEnumKind, XrefSearchResponse, \
+          XrefSearchRequest, CallGraphRequest, KytheXrefKind, XrefSearchResponse, \
           AnnotationType, AnnotationTypeValue, NoSourceRootError, \
-          InstallTestRequestHandler
+          InstallTestRequestHandler, XrefNode
   from render.render import RenderCompoundResponse, RenderNode, LocationMapper, DisableConcealableMarkup
 except ImportError:
-  vim.command('echoerr "{}"'.format(r"""Can't import 'codesearch' module.
+  vim.command('echoerr "{}"'.format("""\
+Can't import 'codesearch' module.
 
 Looks like the 'codesearch-py' module can't be located. This is pulled into the
 vim-codesearch plugin via Git Submodules. In case your package manager didn't
@@ -55,7 +56,8 @@ def inner_call_wrapper(*args, **kwargs):
         return default
       except NoSourceRootError:
         vim.command('echoerr "{}"'.format(
-            r"""Couldn't determine Chromium source location.
+            """\
+Couldn't determine Chromium source location.
 
 In order to show search results and link to corresponding files in the working
 directory, this plugin needs to know the location of your Chromium checkout.
@@ -383,18 +385,21 @@ def GetCallers():
     if not hasattr(c, 'file_path') or not hasattr(c, 'call_site_range'):
       continue
     lines.append('{}:{}:{}: {}'.format(
-        os.path.join(cs.GetSourceRoot(), c.file_path), c.call_site_range.
-        start_line, c.call_site_range.start_column, c.display_name))
+        os.path.join(cs.GetSourceRoot(), c.file_path), c.call_site_range.start_line, c.call_site_range.start_column, c.display_name))
   return '\n'.join(lines)
 
 
 def _XrefSearchResultsToQuickFixList(cs, results):
   lines = []
+  assert isinstance(results, list)
   for r in results:
-    for m in r.match:
+      assert isinstance(r, XrefNode)
+      if not hasattr(r.single_match, 'line_number') or not hasattr(r.single_match, 'line_text'):
+          continue
+      filepath = os.path.join(cs.GetSourceRoot(), r.filespec.name)
       lines.append('{}:{}:1: {}'.format(
-          os.path.join(cs.GetSourceRoot(), r.file.name), m.line_number,
-          m.line_text))
+          filepath, r.single_match.line_number,
+          r.single_match.line_text))
   return lines
 
 
@@ -404,7 +409,8 @@ def _GetLocationsForXrefType(t):
     return []
 
   cs = _GetCodeSearch()
-  results = cs.GetXrefsFor(signature, [t])
+  node = XrefNode.FromSignature(cs, signature)
+  results = node.Traverse(t)
   return _XrefSearchResultsToQuickFixList(cs, results)
 
 
@@ -413,24 +419,32 @@ def _GetCallTargets():
   if not signature:
     return []
   cs = _GetCodeSearch()
-  results = cs.GetCallTargets(signature)
+  node = XrefNode.FromSignature(cs, signature)
+  dcl_list = node.Traverse([KytheXrefKind.DECLARATION, KytheXrefKind.DEFINITION])
+  if len(dcl_list) == 0:
+      return []
+
+  overrides = []
+  for dcl in dcl_list:
+      overrides.extend(dcl.Traverse(KytheXrefKind.OVERRIDDEN_BY))
+
+  results = dcl_list + overrides
   return _XrefSearchResultsToQuickFixList(cs, results)
 
 
 REFERENCE_TYPES = {
-    'call': EdgeEnumKind.CALL,
-    'called at': EdgeEnumKind.CALLED_AT,
-    'caller': EdgeEnumKind.CALLED_AT,
-    'declaration': EdgeEnumKind.HAS_DECLARATION,
-    'definition': EdgeEnumKind.HAS_DEFINITION,
-    'extended by': EdgeEnumKind.EXTENDED_BY,
-    'extends': EdgeEnumKind.EXTENDS,
-    'instantiations': EdgeEnumKind.INSTANTIATED_AT,
-    'overridden by': EdgeEnumKind.OVERRIDDEN_BY,
-    'overrides': EdgeEnumKind.OVERRIDES,
-    'references': EdgeEnumKind.REFERENCED_AT,
-    'subclasses': EdgeEnumKind.EXTENDED_BY,
-    'superclasses': EdgeEnumKind.EXTENDS,
+    'called at': KytheXrefKind.CALLED_BY,
+    'caller': KytheXrefKind.CALLED_BY,
+    'declaration': KytheXrefKind.DECLARATION,
+    'definition': KytheXrefKind.DEFINITION,
+    'extended by': KytheXrefKind.EXTENDED_BY,
+    'extends': KytheXrefKind.EXTENDS,
+    'instantiations': KytheXrefKind.INSTANTIATION,
+    'overridden by': KytheXrefKind.OVERRIDDEN_BY,
+    'overrides': KytheXrefKind.OVERRIDES,
+    'references': KytheXrefKind.REFERENCE,
+    'subclasses': KytheXrefKind.EXTENDED_BY,
+    'superclasses': KytheXrefKind.EXTENDS,
     'call targets': _GetCallTargets,
 }