diff options
author | Xin Li <delphij@google.com> | 2023-10-05 15:43:36 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-10-05 15:43:36 -0700 |
commit | 7fa37a8f04ebaf2f52734e1c81c6b59864ad10dd (patch) | |
tree | f613d49dbfe384fb726273eff8995cc3fcdfb1a3 | |
parent | 8bf8bc37e54835e3896873d4d4070260513d0fb6 (diff) | |
parent | 5d70a692eafc4c9295d7d731b99cd36ee70f5238 (diff) | |
download | ktlint-7fa37a8f04ebaf2f52734e1c81c6b59864ad10dd.tar.gz |
Merge Android 14ub-automotive-master-20231102ub-automotive-master-20231011
Bug: 298295554
Merged-In: I9e02d4b8426a66a743ad8a160190ea59a15be522
Change-Id: I9ac00e61e849ac9251684d0019cf0148e6a43578
-rw-r--r-- | .editorconfig | 1 | ||||
-rwxr-xr-x | ktlint.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig index 1e3f51c..c7cc35a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,3 +4,4 @@ max_line_length = 100 trim_trailing_whitespace = true insert_final_newline = true ij_kotlin_imports_layout=* +ij_kotlin_packages_to_use_import_on_demand=kotlinx.android.synthetic.** @@ -43,6 +43,7 @@ def main(args=None): parser.add_argument('--format', '-F', dest='format', action='store_true') parser.add_argument('--noformat', dest='format', action='store_false') parser.add_argument('--no-verify-format', dest='verify_format', action='store_false') + parser.add_argument('--editorconfig', default=EDITOR_CONFIG) parser.set_defaults(format=False, verify_format=True) args = parser.parse_args() kt_files = [f for f in args.file if f.endswith('.kt') or f.endswith('.kts')] @@ -57,9 +58,12 @@ def main(args=None): disabled_rules += ['final-newline', 'no-consecutive-blank-lines', 'import-ordering'] ktlint_args = kt_files[:] - ktlint_args += ['--editorconfig', EDITOR_CONFIG] ktlint_args += ['--disabled_rules=' + ','.join(disabled_rules)] + # Setup editor config explicitly if defined - else will inherit from tree + if args.editorconfig is not None: + ktlint_args += ['--editorconfig', args.editorconfig] + # Automatically format files if requested. if args.format: ktlint_args += ['-F'] |