[Extension API Extern Generation] Fix comment indentation

tools/json_schema_compiler/code.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.
 
 class Code(object):
   """A convenience object for constructing code.
 
   Logically each object should be a block of code. All methods except |Render|
   and |IsEmpty| return self.
   """
@@ skipping 67 matching lines @@
     line if not given).
     """
     # TODO(calamity): Decide if type checking is necessary
     #if not isinstance(line, basestring):
     #  raise TypeError
     self._indent_level -= self._indent_size
     if line is not None:
       self.Append(line)
     return self
 
-  def Comment(self, comment, comment_prefix='// '):
+  def Comment(self, comment, comment_prefix='// ', wrap_indent=0):
     """Adds the given string as a comment.
 
     Will split the comment if it's too long. Use mainly for variable length
     comments. Otherwise just use code.Append('// ...') for comments.
 
     Unaffected by code.Substitute().
     """
-    max_len = self._comment_length - self._indent_level - len(comment_prefix)
-    while len(comment) >= max_len:
+    # Helper function to trim a comment to the maximum length, and return one
+    # line and the remainder of the comment.
+    def trim_comment(comment, max_len):
+      if len(comment) <= max_len:
+        return comment, ''
       line = comment[0:max_len]

[Devlin, 2015/03/26 22:36:54]

Technically, this means treats the max length as 1 less than the comment line
length (i.e., 79 instead of 80).  Is that intentional?  It's even part of the
test case...

[Dan Beam, 2015/03/26 22:41:48]

i think 80 is fine...?

[Devlin, 2015/03/26 23:13:08]

Thought so, but figured good to double check.

       last_space = line.rfind(' ')
       if last_space != -1:
         line = line[0:last_space]
         comment = comment[last_space + 1:]
       else:
         comment = comment[max_len:]
-      self.Append(comment_prefix + line, substitute=False)
-    self.Append(comment_prefix + comment, substitute=False)
+      return line, comment
+
+    # First line has the full maximum length.
+    max_len = self._comment_length - self._indent_level - len(comment_prefix)
+    line, comment = trim_comment(comment, max_len)
+    self.Append(comment_prefix + line, substitute=False)
+
+    # Any subsequent lines be subject to the wrap indent.
+    max_len = max_len - wrap_indent
+    while len(comment):
+      line, comment = trim_comment(comment, max_len)
+      self.Append(comment_prefix + (' ' * wrap_indent) + line, substitute=False)
+
     return self
 
   def Substitute(self, d):
     """Goes through each line and interpolates using the given dict.
 
     Raises type error if passed something that isn't a dict
 
     Use for long pieces of code using interpolation with the same variables
     repeatedly. This will reduce code and allow for named placeholders which
     are more clear.
@@ skipping 16 matching lines @@
     """
     return '\n'.join([l.value for l in self._code])
 
 
 class Line(object):
   """A line of code.
   """
   def __init__(self, value, substitute=True):
     self.value = value
     self.substitute = substitute