Chromium Code Reviews| Index: third_party/closure_compiler/checker.py |
| diff --git a/third_party/closure_compiler/checker.py b/third_party/closure_compiler/checker.py |
| index 2eb9e68a21f606fc41e3e6ba4859649483138d13..9db42c88bbeb932a461de891e1e34745e8d76208 100755 |
| --- a/third_party/closure_compiler/checker.py |
| +++ b/third_party/closure_compiler/checker.py |
| @@ -44,6 +44,8 @@ class Checker(object): |
| "--jscomp_error=visibility", |
| "--language_in=ECMASCRIPT5_STRICT", |
| "--summary_detail_level=3", |
| + "--compilation_level=WHITESPACE_ONLY", |
| + "--source_map_format=V3", |
| ] |
| # These are the extra flags used when compiling in 'strict' mode. |
| @@ -177,11 +179,16 @@ class Checker(object): |
| tmp_file.write(contents) |
| return tmp_file.name |
| - def run_js_check(self, sources, externs=None): |
| + def _run_js_check(self, sources, out_file=None, externs=None): |
| if not self._check_java_path(): |
| return 1, "" |
| args = ["--js=%s" % s for s in sources] |
| + |
| + if out_file: |
| + args += ["--js_output_file=%s" % out_file] |
| + args += ["--create_source_map=%s.map" % out_file] |
| + |
| if externs: |
| args += ["--externs=%s" % e for e in externs] |
| args_file_content = " %s" % " ".join(self._common_args() + args) |
| @@ -201,11 +208,12 @@ class Checker(object): |
| return errors, stderr |
| - def check(self, source_file, depends=None, externs=None): |
| + def check(self, source_file, out_file=None, depends=None, externs=None): |
| """Closure compile a file and check for errors. |
| Args: |
| source_file: A file to check. |
| + out_file: A file where the compiled output is written to. |
| depends: Other files that would be included with a <script> earlier in |
| the page. |
| externs: @extern files that inform the compiler about custom globals. |
| @@ -240,7 +248,8 @@ class Checker(object): |
| self._expanded_file = self._create_temp_file(self._processor.contents) |
| self._debug("Expanded file: %s" % self._expanded_file) |
| - errors, stderr = self.run_js_check([self._expanded_file], externs) |
|
Dan Beam
2015/03/09 16:45:51
oh, guess this is used somewhere else...
|
| + errors, stderr = self._run_js_check([self._expanded_file], |
| + out_file=out_file, externs=externs) |
| # Filter out false-positive promise chain errors. |
| # See https://github.com/google/closure-compiler/issues/715 for details. |
| @@ -283,7 +292,8 @@ if __name__ == "__main__": |
| help="Process all source files as a group") |
| parser.add_argument("-d", "--depends", nargs=argparse.ZERO_OR_MORE) |
| parser.add_argument("-e", "--externs", nargs=argparse.ZERO_OR_MORE) |
| - parser.add_argument("-o", "--out_file", help="A place to output results") |
| + parser.add_argument("-o", "--out_file", |
| + help="A file where the compiled output is written to") |
| parser.add_argument("-v", "--verbose", action="store_true", |
| help="Show more information as this script runs") |
| parser.add_argument("--strict", action="store_true", |
| @@ -297,6 +307,11 @@ if __name__ == "__main__": |
| depends = opts.depends or [] |
| externs = opts.externs or set() |
| + if opts.out_file: |
| + out_dir = os.path.dirname(opts.out_file) |
| + if not os.path.exists(out_dir): |
| + os.makedirs(out_dir) |
| + |
| checker = Checker(verbose=opts.verbose, strict=opts.strict) |
| if opts.single_file: |
| for source in opts.sources: |
| @@ -304,16 +319,11 @@ if __name__ == "__main__": |
| source, |
| depends, |
| externs) |
| - has_errors, _ = checker.check(source, depends=depends, externs=externs) |
| + has_errors, _ = checker.check(source, out_file=opts.out_file, |
| + depends=depends, externs=externs) |
| if has_errors: |
| sys.exit(1) |
| - if opts.out_file: |
| - out_dir = os.path.dirname(opts.out_file) |
| - if not os.path.exists(out_dir): |
| - os.makedirs(out_dir) |
| - # TODO(dbeam): write compiled file to |opts.out_file|. |
| - open(opts.out_file, "w").write("") |
| else: |
| has_errors, errors = checker.check_multiple(opts.sources) |
| if has_errors: |