Merge Android 13 QPR1ub-automotive-master-20230303ub-automotive-master-20221215main-16k-with-phones

Bug: 261731544
Merged-In: Iaf21df8e85943229c1d832b186825b41cf231b2d
Change-Id: Iac9c866a297918b5d4960c577d22e7892c06a415

3 files changed, 17 insertions, 2 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..e97aa07
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+[*.{kt,kts}]
+indent_size = 4
+max_line_length = 100
+trim_trailing_whitespace = true
+insert_final_newline = true
+ij_kotlin_imports_layout=*
+
+# Comma-separated list of rules to disable
+# ktlint disagrees on indentation with ktfmt in some cases
+# TODO(b/185904220): paren spacing disabled because of a ktfmt bug
+# TODO(b/189506168): curly spacing disabled because of a ktfmt bug
+disabled_rules=indent,paren-spacing,curly-spacing,wrapping
diff --git a/ktlint-android-all.jar b/ktlint-android-all.jar
index fce8357..8de50b3 100644
--- a/ktlint-android-all.jar
+++ b/ktlint-android-all.jar
diff --git a/ktlint.py b/ktlint.py
index 16bc0f8..86b15ed 100755
--- a/ktlint.py
+++ b/ktlint.py
@@ -28,6 +28,7 @@ import sys
 
 MAIN_DIRECTORY = os.path.normpath(os.path.dirname(__file__))
 KTLINT_JAR = os.path.join(MAIN_DIRECTORY, 'ktlint-android-all.jar')
+EDITOR_CONFIG = os.path.join(MAIN_DIRECTORY, '.editorconfig')
 FORMAT_MESSAGE = '''
 **********************************************************************
 To format run:
@@ -44,11 +45,13 @@ def main(args=None):
   parser.set_defaults(format=False)
   args = parser.parse_args()
   kt_files = [f for f in args.file if f.endswith('.kt') or f.endswith('.kts')]
+  if not kt_files:
+    sys.exit(0)
+
   ktlint_args = kt_files[:]
+  ktlint_args += ['--editorconfig', EDITOR_CONFIG]
   if args.format:
     ktlint_args += ['-F']
-  if not ktlint_args:
-    sys.exit(0)
 
   ktlint_args += ['--android']