Prase IDL files in common/extensions/api PRESUBMIT check.

chrome/common/extensions/api/PRESUBMIT.py

 # Copyright 2013 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.
 
 def _GetJSONParseError(input_api, contents):
   try:
     json_comment_eater = input_api.os_path.join(
         input_api.PresubmitLocalPath(),
         '..', '..', '..', '..', 'tools',
         'json_comment_eater', 'json_comment_eater.py')
     process = input_api.subprocess.Popen(
         [input_api.python_executable, json_comment_eater],
         stdin=input_api.subprocess.PIPE,
         stdout=input_api.subprocess.PIPE)
     (nommed, _) = process.communicate(input=contents)
     input_api.json.loads(nommed)
   except ValueError as e:
     return e
   return None
 
 
+def _GetIDLParseError(input_api, filename):
+  idl_schema = input_api.os_path.join(
+      input_api.PresubmitLocalPath(),
+      '..', '..', '..', '..', 'tools',
+      'json_schema_compiler', 'idl_schema.py')
+  process = input_api.subprocess.Popen(
+      [input_api.python_executable, idl_schema, filename],
+      stdout=input_api.subprocess.PIPE,
+      stderr=input_api.subprocess.PIPE)
+  (_, error) = process.communicate()
+  if error:
+    return error
+  return None
+
+
 def _GetParseErrors(input_api, output_api):
   # Run unit tests.
   results = []
   if input_api.AffectedFiles(
       file_filter=lambda f: 'PRESUBMIT' in f.LocalPath()):
     results = input_api.canned_checks.RunUnitTestsInDirectory(
         input_api, output_api, '.', whitelist=[r'^PRESUBMIT_test\.py$'])
 
   for affected_file in input_api.AffectedFiles(
       file_filter=lambda f: f.LocalPath().endswith('.json'),
       include_deletes=False):
     filename = affected_file.AbsoluteLocalPath()
     contents = input_api.ReadFile(filename)
     parse_error = _GetJSONParseError(input_api, contents)
     if parse_error:
       results.append(output_api.PresubmitError(
           'Features file %s could not be parsed: %s' %
           (affected_file.LocalPath(), parse_error)))
-    # TODO(yoz): Also ensure IDL files are parseable.
+
+  for affected_file in input_api.AffectedFiles(
+        file_filter=lambda f: f.LocalPath().endswith('.idl')):
+      filename = affected_file.AbsoluteLocalPath()

[not at google - send to devlin, 2013/09/09 16:14:07]

too much indent

[Haojian Wu, 2013/09/10 02:51:04]

Done.

+      parse_error = _GetIDLParseError(input_api, filename)
+      if parse_error:
+        results.append(output_api.PresubmitError(
+            'Features file %s could not be parsed: %s' %

[not at google - send to devlin, 2013/09/09 16:14:07]

s/Features/IDL/

[Haojian Wu, 2013/09/10 02:51:04]

Done.

+            (affected_file.LocalPath(), parse_error)))

[not at google - send to devlin, 2013/09/09 16:14:07]

You could factor this more concisely:

actions = {
  '.json': _GetJSONParseError,
  '.idl':  _GetIDLParseError
}
def get_action(filename):
  return actions.get(os.path.splitext(filename)[1])

for affected_file in input_api.AffectedFiles(file_filter=get_action):
  filename = affected_file.AbsoluteLocalPath()
  parse_error = get_action(affected_file)(input_api,
                                          filename,
                                          input_api.ReadFile(filename))
  if parse_error:
    results.append(output_api.PresubmitError('%s could not be parsed: %s' %
        (affected_file.LocalPath(), parse_error))

then factor _GetJSONParseError and _GetIDLParseError to match. It looks like
they share a lot of structure too, so you could do some cleanup there.

[Haojian Wu, 2013/09/10 02:51:04]

Done. Thanks for the detailed instructions!

   return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
   return _GetParseErrors(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return _GetParseErrors(input_api, output_api)