Allow 'class Singleton<T>' in header files.

presubmit_canned_checks.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.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 
 ### Description checks
 
 def CheckChangeHasTestField(input_api, output_api):
@@ skipping 806 matching lines @@
     if input_api.is_committing:
       res_type = output_api.PresubmitPromptWarning
     else:
       res_type = output_api.PresubmitNotifyResult
     return [ res_type('|const NSClass*| is wrong, see ' +
                       'http://dev.chromium.org/developers/clang-mac',
                       files) ]
   return []
 
 
-def _CheckSingletonInHeaders(input_api, output_api, source_file_filter):
+def CheckSingletonInHeaders(input_api, output_api, source_file_filter=None):
   """Checks to make sure no header files have |Singleton<|."""
-  pattern = input_api.re.compile(r'Singleton\s*<')
+  pattern = input_api.re.compile(r'(?<!class\s)Singleton\s*<')
   files = []
   for f in input_api.AffectedSourceFiles(source_file_filter):
     if (f.LocalPath().endswith('.h') or f.LocalPath().endswith('.hxx') or
         f.LocalPath().endswith('.hpp') or f.LocalPath().endswith('.inl')):
       contents = input_api.ReadFile(f)
       for line in contents.splitlines(False):
-        line = input_api.re.sub(r'//.*$', '', line)  # Strip C++ comment.
-        if pattern.search(line):
+        if (not input_api.re.match(r'//', line) and # Strip C++ comment.
+            pattern.search(line)):
           files.append(f)
           break
 
   if files:
     return [ output_api.PresubmitError(
         'Found Singleton<T> in the following header files.\n' +
         'Please move them to an appropriate source file so that the ' +
         'template gets instantiated in a single compilation unit.',
         files) ]
   return []
@@ skipping 69 matching lines @@
   snapshot( "checking tabs")
   results.extend(input_api.canned_checks.CheckChangeHasNoTabs(
       input_api, output_api, source_file_filter=sources))
   snapshot( "checking stray whitespace")
   results.extend(input_api.canned_checks.CheckChangeHasNoStrayWhitespace(
       input_api, output_api, source_file_filter=sources))
   snapshot("checking nsobjects")
   results.extend(_CheckConstNSObject(
       input_api, output_api, source_file_filter=sources))
   snapshot("checking singletons")
-  results.extend(_CheckSingletonInHeaders(
+  results.extend(CheckSingletonInHeaders(
       input_api, output_api, source_file_filter=sources))
 
   # The following checks are only done on commit, since the commit bot will
   # auto-fix most of these.
   if input_api.is_committing:
     snapshot("checking eol style")
     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("checking was uploaded")
     results.extend(input_api.canned_checks.CheckChangeWasUploaded(
         input_api, output_api))
   snapshot("done")
   return results