Add ChromeCodingConvention.java to Closure Compiler to preserve getInstance() type

third_party/closure_compiler/checker.py

 # Copyright 2014 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 collections import defaultdict
 import os
 import re
 import subprocess
 import sys
 import tempfile
 
 
 
 class LineNumber(object):
   def __init__(self, file, line_number):
     self.file = file
     self.line_number = int(line_number)
 
 
 class FileCache(object):
   _cache = defaultdict(str)
-    
+
   def _read(self, file):
     file = os.path.abspath(file)
     self._cache[file] = self._cache[file] or open(file, "r").read()
     return self._cache[file]
 
   @staticmethod
   def read(file):
     return FileCache()._read(file)
 
 
@@ skipping 65 matching lines @@
   _found_java = False
 
   _jar_command = [
     "java",
     "-jar",
     "-Xms1024m",
     "-server",
     "-XX:+TieredCompilation"
   ]
 
-  def __init__(self, verbose=False):
+  def __init__(self, verbose=False, exit_on_fatal=True):

[Dan Beam, 2014/07/29 23:27:44]

remove this parameter

[Vitaly Pavlenko, 2014/07/29 23:42:26]

Done.

     current_dir = os.path.join(os.path.dirname(__file__))
     self._compiler_jar = os.path.join(current_dir, "lib", "compiler.jar")
     self._runner_jar = os.path.join(current_dir, "runner", "runner.jar")
     self._temp_files = []
     self._verbose = verbose
+    self._exit_on_fatal = exit_on_fatal
 
   def _clean_up(self):
     if not self._temp_files:
       return
 
     self._debug("Deleting temporary files: " + ", ".join(self._temp_files))
     for f in self._temp_files:
       os.remove(f)
     self._temp_files = []
 
   def _debug(self, msg, error=False):
     if self._verbose:
       print "(INFO) " + msg
 
   def _fatal(self, msg):
     print >> sys.stderr, "(FATAL) " + msg
     self._clean_up()
-    sys.exit(1)
+    if self._exit_on_fatal:
+      sys.exit(1)
+    else:
+      return 1

[Dan Beam, 2014/07/29 23:27:44]

i meant return 1 as the exit code of calling check()

[Vitaly Pavlenko, 2014/07/29 23:42:26]

Done.

 
   def _run_command(self, cmd):
     cmd_str = " ".join(cmd)
     self._debug("Running command: " + cmd_str)
 
     devnull = open(os.devnull, "w")
     return subprocess.Popen(
         cmd_str, stdout=devnull, stderr=subprocess.PIPE, shell=True)
 
   def _check_java_path(self):
@@ skipping 63 matching lines @@
     self._debug("Args file: " + args_file)
 
     runner_args = ["--compiler-args-file=" + args_file]
     runner_cmd = self._run_jar(self._runner_jar, args=runner_args)
     (_, stderr) = runner_cmd.communicate()
 
     errors = stderr.strip().split("\n\n")
     self._debug("Summary: " + errors.pop())
 
     output = self._format_errors(map(self._fix_up_error, errors))
+
     if runner_cmd.returncode:
-      self._fatal("Error in: " + file + ("\n" + output if output else ""))
+      message = "Error in: " + file + ("\n" + output if output else "")
+      if self._exit_on_fatal:
+        self._fatal(message)
+      else:
+        self._debug(message)
     elif output:
       self._debug("Output: " + output)
-   
+
     self._clean_up()
 
-    return runner_cmd.returncode == 0
+    return runner_cmd.returncode == 0, output