Improve CheckLongLines() to increase the hard limit at 50% when an exception is found.

presubmit_canned_checks.py

 # Copyright (c) 2010 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.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 
 ### Description checks
 
 def CheckChangeHasTestField(input_api, output_api):
@@ skipping 284 matching lines @@
     return [output_api.PresubmitPromptWarning(
         'Found line ending with white spaces in:',
         long_text='\n'.join(errors))]
   return []
 
 
 def CheckLongLines(input_api, output_api, maxlen=80, source_file_filter=None):
   """Checks that there aren't any lines longer than maxlen characters in any of
   the text files to be submitted.
   """
+  # Stupidly long symbols that needs to be worked around if takes 66% of line.
+  long_symbol = maxlen * 2 / 3
+  # Hard line length limit at 50% more.
+  extra_maxlen = maxlen * 3 / 2
+  # Note: these are C++ specific but processed on all languages. :(
+  MACROS = ('#define', '#include', '#import', '#pragma', '#if', '#endif')
+
   def no_long_lines(line):
-    # Allow lines with http://, https:// and #define/#pragma/#include/#if/#endif
-    # to exceed the maxlen rule.
-    return (len(line) <= maxlen or
-            any((url in line) for url in ('http://', 'https://')) or
-            line.startswith(('#define', '#include', '#import', '#pragma',
-                             '#if', '#endif')))
+    if len(line) <= maxlen:
+      return True
+
+    if len(line) > extra_maxlen:
+      return False
+
+    return (
+        line.startswith(MACROS) or

[Dirk Pranke, 2011/06/20 18:19:22]

Hm. Didn't realize you can use tuples here. Cool.

+        any((url in line) for url in ('http://', 'https://')) or
+        input_api.re.match(
+          r'.*[A-Za-z][A-Za-z_0-9]{%d,}.*' % long_symbol, line))
 
   def format_error(filename, line_num, line):
     return '%s, line %s, %s chars' % (filename, line_num, len(line))
 
   errors = _FindNewViolationsOfRule(no_long_lines, input_api,
                                     source_file_filter,
                                     error_formatter=format_error)
   if errors:
     msg = 'Found lines longer than %s characters (first 5 shown).' % maxlen
     return [output_api.PresubmitPromptWarning(msg, items=errors[:5])]
@@ skipping 590 matching lines @@
     results.extend(input_api.canned_checks.CheckChangeSvnEolStyle(
         input_api, output_api, source_file_filter=text_files))
     snapshot("checking svn mime types")
     results.extend(input_api.canned_checks.CheckSvnForCommonMimeTypes(
         input_api, output_api))
     snapshot("checking license")
     results.extend(input_api.canned_checks.CheckLicense(
         input_api, output_api, license_header, source_file_filter=sources))
   snapshot("done")
   return results