diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-21 08:24:53 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-21 08:24:53 +0000 |
commit | 304cefeb31d7a1358292b3a605b9eee690191128 (patch) | |
tree | ccc62cea92e9e13d496ff930d8266a8cc8e09be4 | |
parent | a43d617ceec3f50d315e5b5c7f05101b8358454f (diff) | |
parent | e4158b37f3394e0398050be9e31d206063282bc6 (diff) | |
download | ktlint-304cefeb31d7a1358292b3a605b9eee690191128.tar.gz |
Snap for 4557233 from e4158b37f3394e0398050be9e31d206063282bc6 to pi-release
Change-Id: I0116f29278aa1ceb2df573141e7552167e0a19ad
-rwxr-xr-x | ktlint.py | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -31,15 +31,20 @@ KTLINT_JAR = os.path.join(MAIN_DIRECTORY, 'ktlint-android-all.jar') def main(args=None): parser = argparse.ArgumentParser() parser.add_argument('--file', '-f', nargs='*') + parser.add_argument('--format', '-F', dest='format', action='store_true') + parser.add_argument('--noformat', dest='format', action='store_false') + parser.set_defaults(format=False) args = parser.parse_args() - kotlin_files = [f for f in args.file if f.endswith('.kt')] - if not kotlin_files: + ktlint_args = [f for f in args.file if f.endswith('.kt')] + if args.format: + ktlint_args += ['-F'] + if not ktlint_args: sys.exit(0) ktlint_env = os.environ.copy() ktlint_env['JAVA_CMD'] = 'java' try: - check = subprocess.Popen(['java', '-jar', KTLINT_JAR] + kotlin_files, + check = subprocess.Popen(['java', '-jar', KTLINT_JAR] + ktlint_args, stdout=subprocess.PIPE, env=ktlint_env) stdout, _ = check.communicate() if stdout: |