Correct $ref links in extensions documentation server relative location.

chrome/common/extensions/docs/server2/reference_resolver.py

 # Copyright (c) 2012 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.
 
 from copy import deepcopy
 import logging
 import re
 import string
 
 from file_system import FileNotFoundError
@@ skipping 26 matching lines @@
   key = '%s/%s' % (namespace, ref)
   # AppEngine doesn't like keys > 500, but there will be some other stuff
   # that goes into this key, so truncate it earlier.  This shoudn't be
   # happening anyway unless there's a bug, such as http://crbug.com/314102.
   max_size = 256
   if len(key) > max_size:
     logging.error('Key was >%s characters: %s' % (max_size, key))
     key = key[:max_size]
   return key
 
-

[not at google - send to devlin, 2013/11/22 20:16:10]

python style is actually to have 2 blank lines between top-level declarations.

[benwells, 2013/11/27 07:28:31]

Done.

 class ReferenceResolver(object):
   """Resolves references to $ref's by searching through the APIs to find the
   correct node.
 
   $ref's have two forms:
 
     $ref:api.node - Replaces the $ref with a link to node on the API page. The
                     title is set to the name of the node.
 
     $ref:[api.node The Title] - Same as the previous form but title is set to
@@ skipping 105 matching lines @@
       return ref_data
     logging.error('$ref %s could not be resolved in namespace %s.' %
         (ref, namespace))
     type_name = ref.rsplit('.', 1)[-1]
     return {
       'href': '#type-%s' % type_name,
       'text': title or ref,
       'name': ref
     }
 
-  def ResolveAllLinks(self, text, namespace=None):
+  def ResolveAllLinks(self, text, requestPath='', namespace=None):

[not at google - send to devlin, 2013/11/22 20:16:10]

requestPath -> request_path

[benwells, 2013/11/27 07:28:31]

Done.

     """This method will resolve all $ref links in |text| using namespace
     |namespace| if not None. Any links that cannot be resolved will be replaced
     using the default link format that |SafeGetLink| uses.
+    The links are relative, with the prefix for the path determined by
+    inspecting request.path.

[not at google - send to devlin, 2013/11/22 20:16:10]

Perhaps just "Links will be generated relative to |request_path|".

For that matter, perhaps "request_path" is too specific; the abstract concept
here is "relative_to", so perhaps that?

[benwells, 2013/11/27 07:28:31]

Done.

     """
     if text is None or '$ref:' not in text:
       return text
+
+    link_prefix = ''
+    # requestPath should be of the form (apps|extensions)/...../page.html. 
+    # link_prefix should  that the target will point to
+    # (apps|extensions)/target.html.
+    if requestPath is not '':
+      link_prefix = '../' * (requestPath.count('/') - 1)
     split_text = text.split('$ref:')
     # |split_text| is an array of text chunks that all start with the
     # argument to '$ref:'.
     formatted_text = [split_text[0]]
     for ref_and_rest in split_text[1:]:
       title = None
       if ref_and_rest.startswith('[') and ']' in ref_and_rest:
         # Text was '$ref:[foo.bar maybe title] other stuff'.
         ref_with_title, rest = ref_and_rest[1:].split(']', 1)
         ref_with_title = ref_with_title.split(None, 1)
         if len(ref_with_title) == 1:
           # Text was '$ref:[foo.bar] other stuff'.
           ref = ref_with_title[0]
         else:
           # Text was '$ref:[foo.bar title] other stuff'.
           ref, title = ref_with_title
       else:
         # Text was '$ref:foo.bar other stuff'.
         match = self._bare_ref.match(ref_and_rest)
         if match is None:
           ref = ''
           rest = ref_and_rest
         else:
           ref = match.group()
           rest = ref_and_rest[match.end():]
 
       ref_dict = self.SafeGetLink(ref, namespace=namespace, title=title)
-      formatted_text.append('<a href="%(href)s">%(text)s</a>%(rest)s' %
-          { 'href': ref_dict['href'], 'text': ref_dict['text'], 'rest': rest })
+      formatted_text.append('<a href="%s%s">%s</a>%s' %
+          (link_prefix, ref_dict['href'], ref_dict['text'], rest))
     return ''.join(formatted_text)