Merge Android U (ab/10368041)tmp_amf_298295554

Bug: 291102124
Merged-In: Id85e2f80b64a9789407f55e86530548f83743f25
Change-Id: I2020d065db2eacb30304f8d6640cae7b33e2e24f

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.**
diff --git a/ktlint.py b/ktlint.py
index aefff63..2574319 100755
--- a/ktlint.py
+++ b/ktlint.py
@@ -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']