From c021bf581bf01a6913bf98b90511bd268d562a22 Mon Sep 17 00:00:00 2001
From: Zachary Klippenstein <zachklipp@squareup.com>
Date: Fri, 19 Jan 2018 07:12:35 -0800
Subject: [PATCH 01/22] Set from Kotlin Style Guide using the new Kotlin plugin
 with fuller formatting support.

---
 configs/codestyles/SquareAndroid.xml | 49 ++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index d4ce731..81f90bb 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -6,11 +6,6 @@
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
       <option name="TAB_SIZE" value="2" />
-      <option name="USE_TAB_CHARACTER" value="false" />
-      <option name="SMART_TABS" value="false" />
-      <option name="LABEL_INDENT_SIZE" value="0" />
-      <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-      <option name="USE_RELATIVE_INDENTS" value="false" />
     </value>
   </option>
   <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
@@ -80,6 +75,25 @@
   </AndroidXmlCodeStyleSettings>
   <JavaCodeStyleSettings>
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+    <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    <option name="JD_P_AT_EMPTY_LINES" value="false" />
+    <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+    <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+    <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+    <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
   </JavaCodeStyleSettings>
   <JetCodeStyleSettings>
     <option name="PACKAGES_TO_USE_STAR_IMPORTS">
@@ -88,6 +102,14 @@
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="999" />
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="999" />
     <option name="IMPORT_NESTED_CLASSES" value="true" />
+    <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
+    <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" />
+    <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />
+    <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
+    <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
+    <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
+    <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
+    <option name="IF_RPAREN_ON_NEW_LINE" value="true" />
   </JetCodeStyleSettings>
   <XML>
     <option name="XML_ALIGN_ATTRIBUTES" value="false" />
@@ -116,7 +138,6 @@
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="Groovy">
     <option name="KEEP_LINE_BREAKS" value="false" />
@@ -145,7 +166,6 @@
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
     <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -190,7 +210,6 @@
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
     <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -200,7 +219,6 @@
   <codeStyleSettings language="JSON">
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="JavaScript">
     <option name="KEEP_LINE_BREAKS" value="false" />
@@ -220,7 +238,6 @@
     <option name="IF_BRACE_FORCE" value="1" />
     <option name="DOWHILE_BRACE_FORCE" value="1" />
     <option name="WHILE_BRACE_FORCE" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
@@ -231,13 +248,18 @@
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    <option name="CALL_PARAMETERS_WRAP" value="1" />
-    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="CALL_PARAMETERS_WRAP" value="5" />
+    <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_WRAP" value="5" />
+    <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
     <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
   </codeStyleSettings>
   <codeStyleSettings language="SQL">
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="TypeScript">
     <option name="KEEP_LINE_BREAKS" value="false" />
@@ -260,7 +282,6 @@
     <option name="IF_BRACE_FORCE" value="1" />
     <option name="DOWHILE_BRACE_FORCE" value="1" />
     <option name="WHILE_BRACE_FORCE" value="1" />
-    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="XML">
     <indentOptions>

From 1101389cc834a804f9ee64445263e39a54b26da1 Mon Sep 17 00:00:00 2001
From: Zachary Klippenstein <zachklipp@squareup.com>
Date: Fri, 19 Jan 2018 06:42:22 -0800
Subject: [PATCH 02/22] Tweaked the newly-default Kotlin style to match our
 existing style more.

Also copied the Kotlin style settings to the non-Android config.
---
 configs/codestyles/Square.xml        | 14 ++++++++++++--
 configs/codestyles/SquareAndroid.xml | 12 ++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index d07d02a..96119dd 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -291,12 +291,22 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
+    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
-    <option name="METHOD_PARAMETERS_WRAP" value="1" />
-    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_WRAP" value="2" />
+    <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="EXTENDS_LIST_WRAP" value="5" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="METHOD_ANNOTATION_WRAP" value="1" />
+    <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    <option name="ENUM_CONSTANTS_WRAP" value="2" />
   </codeStyleSettings>
 </code_scheme>
\ No newline at end of file
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 81f90bb..9fbcf63 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -244,19 +244,23 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
+    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    <option name="CALL_PARAMETERS_WRAP" value="5" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
     <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-    <option name="METHOD_PARAMETERS_WRAP" value="5" />
+    <option name="METHOD_PARAMETERS_WRAP" value="2" />
     <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
     <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-    <option name="EXTENDS_LIST_WRAP" value="1" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="5" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
     <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="METHOD_ANNOTATION_WRAP" value="1" />
+    <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    <option name="ENUM_CONSTANTS_WRAP" value="2" />
   </codeStyleSettings>
   <codeStyleSettings language="SQL">
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />

From d5ed873f747cd085ecb69f3cecc0352fd136f316 Mon Sep 17 00:00:00 2001
From: Zachary Klippenstein <zachklipp@squareup.com>
Date: Thu, 25 Jan 2018 10:18:30 -0800
Subject: [PATCH 03/22] Added continuation indents back, and turned on line
 break preservation.

---
 configs/codestyles/Square.xml        | 1 -
 configs/codestyles/SquareAndroid.xml | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 96119dd..99f7e2c 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -291,7 +291,6 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 9fbcf63..cecb90d 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -103,11 +103,7 @@
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="999" />
     <option name="IMPORT_NESTED_CLASSES" value="true" />
     <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
-    <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" />
     <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />
-    <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
-    <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
-    <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
     <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     <option name="IF_RPAREN_ON_NEW_LINE" value="true" />
   </JetCodeStyleSettings>
@@ -244,7 +240,6 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />

From 2a1c355eb7882c726ea63546ef413b029beb629b Mon Sep 17 00:00:00 2001
From: Zachary Klippenstein <zachklipp@squareup.com>
Date: Tue, 30 Jan 2018 09:08:14 -0800
Subject: [PATCH 04/22] Make the Kotlin indent 2 spaces.

These options haven't shown up before. I used Export from the settings dialog this time instead of just
copying the file from the preferences directory.
---
 configs/codestyles/Square.xml        | 5 +++++
 configs/codestyles/SquareAndroid.xml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 99f7e2c..5aa417d 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -307,5 +307,10 @@
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="2" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
   </codeStyleSettings>
 </code_scheme>
\ No newline at end of file
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index cecb90d..17797f1 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -256,6 +256,11 @@
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="2" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="SQL">
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />

From c03f963c1c7c3673b023b1dc2a687175e471538e Mon Sep 17 00:00:00 2001
From: Ryan Hall <rhall@squareup.com>
Date: Fri, 16 Feb 2018 20:35:08 -0800
Subject: [PATCH 05/22] Do not use star imports

Kotlin appears to have the default option of using star imports after N
imports of the same package. Turn that off.
---
 configs/codestyles/Square.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 5aa417d..4620065 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -74,6 +74,8 @@
     <option name="PACKAGES_TO_USE_STAR_IMPORTS">
       <value />
     </option>
+    <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+    <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
   </JetCodeStyleSettings>
   <SqlCodeStyleSettings>
     <option name="ALIGN_AS_IN_SELECT_STATEMENT" value="false" />

From d4e8e183604781843bf5658f659f4d3f2d14c626 Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jwilson@squareup.com>
Date: Sat, 24 Feb 2018 17:09:12 -0500
Subject: [PATCH 06/22] Track the Kotlin code styles we've adopted in Misk

---
 configs/codestyles/Square.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 4620065..458ef16 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -76,6 +76,7 @@
     </option>
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+    <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
   </JetCodeStyleSettings>
   <SqlCodeStyleSettings>
     <option name="ALIGN_AS_IN_SELECT_STATEMENT" value="false" />
@@ -298,13 +299,11 @@
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
-    <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-    <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-    <option name="METHOD_PARAMETERS_WRAP" value="2" />
+    <option name="METHOD_PARAMETERS_WRAP" value="5" />
     <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
     <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
     <option name="EXTENDS_LIST_WRAP" value="5" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
     <option name="ASSIGNMENT_WRAP" value="1" />
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />

From 90cdbf1249625ea7c96e542f3b77ae47f7ce4a11 Mon Sep 17 00:00:00 2001
From: Jason Holmes <holmes.j@gmail.com>
Date: Thu, 1 Mar 2018 11:53:42 -0800
Subject: [PATCH 07/22] KEEP_LINE_BREAKS on SquareAndroid.xml should be true
 (#55)

Just remove them to match Square.xml
---
 configs/codestyles/SquareAndroid.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 17797f1..ab9b55e 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -30,7 +30,6 @@
   <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
   <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
   <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
-  <option name="KEEP_LINE_BREAKS" value="false" />
   <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
   <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
   <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
@@ -129,14 +128,12 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="CoffeeScript">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
   </codeStyleSettings>
   <codeStyleSettings language="Groovy">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
@@ -171,7 +168,6 @@
   <codeStyleSettings language="JAVA">
     <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
     <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
@@ -213,11 +209,9 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
   </codeStyleSettings>
   <codeStyleSettings language="JavaScript">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
@@ -266,7 +260,6 @@
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
   </codeStyleSettings>
   <codeStyleSettings language="TypeScript">
-    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />

From e1a61999826a448f7d3a6429decdb810e874d535 Mon Sep 17 00:00:00 2001
From: John Rodriguez <jrod@squareup.com>
Date: Wed, 28 Mar 2018 14:25:12 -0400
Subject: [PATCH 08/22] Don't force align Groovy list and map literals

---
 configs/codestyles/SquareAndroid.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index ab9b55e..32ff5cf 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -72,6 +72,10 @@
       </value>
     </option>
   </AndroidXmlCodeStyleSettings>
+  <GroovyCodeStyleSettings>
+    <option name="ALIGN_MULTILINE_LIST_OR_MAP" value="false" />
+    <option name="ALIGN_NAMED_ARGS_IN_MAP" value="false" />
+  </GroovyCodeStyleSettings>
   <JavaCodeStyleSettings>
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
     <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />

From 36fa9a91d7bb1605336cf9223220670a48d4c30b Mon Sep 17 00:00:00 2001
From: "Ravikumar.N" <ravikumar@keepworks.com>
Date: Sat, 9 Mar 2019 00:33:09 +0530
Subject: [PATCH 09/22] app:layout_* should sort above app:* in XML attributes

---
 configs/codestyles/SquareAndroid.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 32ff5cf..2ccd565 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -383,6 +383,17 @@
             <order>BY_NAME</order>
           </rule>
         </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>app:layout_.*</NAME>
+                <XML_NAMESPACE>http://schemas.android.com/apk/res-auto</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
         <section>
           <rule>
             <match>

From edfc51e801bf538d661be5484be684bbc3a786df Mon Sep 17 00:00:00 2001
From: Peter Evjan <pevjan@squareup.com>
Date: Thu, 21 May 2020 11:09:06 +1000
Subject: [PATCH 10/22] IntelliJ 2020 support

The same config files work for IntelliJ 2020, but the location has changed
so added that directory. Also quoting the variable derefences since the new
path contains a space and it doesn't work without it
---
 install.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index a03a9a1..98a2e1c 100755
--- a/install.sh
+++ b/install.sh
@@ -8,23 +8,23 @@ CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs"
 for i in $HOME/Library/Preferences/IntelliJIdea*  \
          $HOME/Library/Preferences/IdeaIC*        \
          $HOME/Library/Preferences/AndroidStudio* \
+         $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
          $HOME/.IntelliJIdea*/config              \
          $HOME/.IdeaIC*/config                    \
          $HOME/.AndroidStudio*/config
 do
-  if [[ -d $i ]]; then
-
+  if [[ -d "$i" ]]; then
     # Install codestyles
-    mkdir -p $i/codestyles
-    cp -frv "$CONFIGS/codestyles"/* $i/codestyles
+    mkdir -p "$i/codestyles"
+    cp -frv "$CONFIGS/codestyles"/* "$i/codestyles"
 
     # Install inspections
-    mkdir -p $i/inspection
-    cp -frv "$CONFIGS/inspection"/* $i/inspection
+    mkdir -p "$i/inspection"
+    cp -frv "$CONFIGS/inspection"/* "$i/inspection"
 
     # Install options ("Exclude from Import and Completion")
-    mkdir -p $i/options
-    cp -frv "$CONFIGS/options"/* $i/options
+    mkdir -p "$i/options"
+    cp -frv "$CONFIGS/options"/* "$i/options"
   fi
 done
 

From f621070f011f6356ff1c91d216a34288772d3eaa Mon Sep 17 00:00:00 2001
From: Ralf Wondratschek <ralf@squareup.com>
Date: Tue, 11 Aug 2020 09:59:20 -0700
Subject: [PATCH 11/22] Stop always wrapping chained function calls in Kotlin.
 The old setting used "Always wrap", the new setting uses "Chop down if long".
 The Java code style uses "Chop down if long", too.

The old setting made code harder to read in many scenarios:

// Old
assertThat(myList).containsExactly("a", "b", "c")
    .inOrder()

// New
assertThat(myList).containsExactly("a", "b", "c").inOrder()

// Old
if (project.file("src/debug")
        .exists() || project.file("src/release")
        .exists()
) {
  return
}

// New
if (project.file("src/debug").exists() || project.file("src/release").exists()) {
  return
}

// Old
val string = "The project path is ${
      project.path.substring(1)
          .replace(':', '/')
    }"

// New
val string = "The project path is ${project.path.substring(1).replace(':', '/')}"

// Old
stringList
    .filter {..}
    .map {
      it.trim()
          .substring(1)
    }

// New
stringList
    .filter {..}
    .map { it.trim().substring(1) }
---
 configs/codestyles/Square.xml        | 2 +-
 configs/codestyles/SquareAndroid.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 458ef16..62a867e 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -303,7 +303,7 @@
     <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
     <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
     <option name="EXTENDS_LIST_WRAP" value="5" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
     <option name="ASSIGNMENT_WRAP" value="1" />
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 2ccd565..e7265ff 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -249,7 +249,7 @@
     <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
     <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
     <option name="EXTENDS_LIST_WRAP" value="5" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
     <option name="ASSIGNMENT_WRAP" value="1" />
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />

From c943ad212965063fc0090ecb828ed49093b25578 Mon Sep 17 00:00:00 2001
From: Ralf Wondratschek <ralf@squareup.com>
Date: Tue, 11 Aug 2020 13:50:41 -0700
Subject: [PATCH 12/22] Update the install path for newer IntelliJ and Android
 Studio versions when using the JetBrains Toolbox.

---
 install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 98a2e1c..9f826a2 100755
--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,9 @@ for i in $HOME/Library/Preferences/IntelliJIdea*  \
          $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
          $HOME/.IntelliJIdea*/config              \
          $HOME/.IdeaIC*/config                    \
-         $HOME/.AndroidStudio*/config
+         $HOME/.AndroidStudio*/config \
+         $HOME/Library/Application\ Support/Google/AndroidStudio* \
+         $HOME/Library/Application\ Support/JetBrains/IdeaIC*
 do
   if [[ -d "$i" ]]; then
     # Install codestyles

From a370d315ffad9483b91901976ced1aca5147a58d Mon Sep 17 00:00:00 2001
From: Thomas Mahoney <thomas.mahoney@opendoor.com>
Date: Wed, 12 Aug 2020 11:43:15 -0400
Subject: [PATCH 13/22] exclude wrong Inject types

According to the Square Java style guide, we should prefer `javax.inject.Inject` for dependency injection: https://wiki.sqprod.co/pages/viewpage.action?pageId=14811784

This PR excludes the other two Inject options from IJ suggestions, enabling developers to auto-import the desired type after annotating a field or constructor with `@Inject`. The google one, at least, still seems to work fine, but there's no reason to prefer it, so we should stick with the style guide's recommendation and also eliminate the manual touchpoint of choosing an import from a list.

Another nice benefit of using the javax type is that IJ understands it, so it prevents the annoying "managed bean must have a constructor with no parameters, or a constructor annotated @Inject" error.

The `com.google.inject.Inject` type is already in widespread use (5k results searching for the import on `go/grep`, vs. 10k for the javax type), but this change shouldn't create a nuisance for anyone working in one of those files - it will just affect import suggestions.
---
 configs/options/editor.codeinsight.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/options/editor.codeinsight.xml b/configs/options/editor.codeinsight.xml
index 8733999..e46761d 100644
--- a/configs/options/editor.codeinsight.xml
+++ b/configs/options/editor.codeinsight.xml
@@ -3,7 +3,9 @@
     <EXCLUDED_PACKAGE NAME="autovalue.shaded" />
     <EXCLUDED_PACKAGE NAME="avro.shaded" />
     <EXCLUDED_PACKAGE NAME="com.beust.jcommander.internal" />
+    <EXCLUDED_PACKAGE NAME="com.google.inject.Inject" />
     <EXCLUDED_PACKAGE NAME="com.sun.istack" />
+    <EXCLUDED_PACKAGE NAME="com.sun.jersey.spi.inject.Inject" />
     <EXCLUDED_PACKAGE NAME="jline.internal" />
     <EXCLUDED_PACKAGE NAME="joptsimple.internal" />
     <EXCLUDED_PACKAGE NAME="junit.framework.Assert" />
@@ -12,6 +14,5 @@
     <EXCLUDED_PACKAGE NAME="org.hibernate.validator.internal" />
     <EXCLUDED_PACKAGE NAME="org.mockito.internal.util.collections" />
     <EXCLUDED_PACKAGE NAME="org.mockito.internal.verification.VerificationModeFactory" />
-    <EXCLUDED_PACKAGE NAME="junit.framework.Assert" />
   </component>
 </application>

From 0985dd3e22df1603f0e0227de0d2a434a0564b95 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Mon, 17 Aug 2020 22:38:56 -0400
Subject: [PATCH 14/22] Enable trailing comma,

---
 configs/codestyles/Square.xml        | 1 +
 configs/codestyles/SquareAndroid.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 458ef16..be6bd86 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -308,6 +308,7 @@
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="2" />
+    <option name="ALLOW_TRAILING_COMMA" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 2ccd565..7dbb9af 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -254,6 +254,7 @@
     <option name="METHOD_ANNOTATION_WRAP" value="1" />
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="2" />
+    <option name="ALLOW_TRAILING_COMMA" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />

From fbaf43b3d9bbf0cbf60fdf80eb7d40d0bec1c8b6 Mon Sep 17 00:00:00 2001
From: Ralf Wondratschek <ralf@squareup.com>
Date: Wed, 11 Nov 2020 17:56:48 -0800
Subject: [PATCH 15/22] Track KtLint's code styles.

---
 configs/codestyles/Square.xml        | 9 +++++++--
 configs/codestyles/SquareAndroid.xml | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 8d77d5a..d7b0a46 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -294,11 +294,16 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
+    <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="LINE_COMMENT_ADD_SPACE" value="true" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
     <option name="METHOD_PARAMETERS_WRAP" value="5" />
     <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
     <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
@@ -311,7 +316,7 @@
     <option name="ALLOW_TRAILING_COMMA" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 24b3232..cea07c4 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -238,9 +238,12 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
+    <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="LINE_COMMENT_ADD_SPACE" value="true" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
@@ -257,7 +260,7 @@
     <option name="ALLOW_TRAILING_COMMA" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>

From 4084167269982aab9965800ce5f40eab0decd1fb Mon Sep 17 00:00:00 2001
From: Will Kwon <wkwon@squareup.com>
Date: Wed, 26 May 2021 10:57:02 -0700
Subject: [PATCH 16/22] Add support for settings repository

---
 install.bat | 3 +++
 install.sh  | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/install.bat b/install.bat
index e1ffa85..884691c 100644
--- a/install.bat
+++ b/install.bat
@@ -7,6 +7,9 @@ setlocal enableDelayedExpansion
 for /D %%i in ("%userprofile%"\.AndroidStudio*) do call :copy_config "%%i"
 for /D %%i in ("%userprofile%"\.IdeaIC*) do call :copy_config "%%i"
 for /D %%i in ("%userprofile%"\.IntelliJIdea*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.AndroidStudio*\settingsRepository\repository) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IdeaIC*\settingsRepository\repository) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IntelliJIdea*\settingsRepository\repository) do call :copy_config "%%i"
 
 echo.
 echo Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square' or 'SquareAndroid'.
diff --git a/install.sh b/install.sh
index 9f826a2..9e08c77 100755
--- a/install.sh
+++ b/install.sh
@@ -8,12 +8,14 @@ CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs"
 for i in $HOME/Library/Preferences/IntelliJIdea*  \
          $HOME/Library/Preferences/IdeaIC*        \
          $HOME/Library/Preferences/AndroidStudio* \
-         $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
          $HOME/.IntelliJIdea*/config              \
          $HOME/.IdeaIC*/config                    \
-         $HOME/.AndroidStudio*/config \
+         $HOME/.AndroidStudio*/config             \
+         $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
          $HOME/Library/Application\ Support/Google/AndroidStudio* \
-         $HOME/Library/Application\ Support/JetBrains/IdeaIC*
+         $HOME/Library/Application\ Support/JetBrains/IdeaIC* \
+         $HOME/Library/Application\ Support/Google/AndroidStudio*/settingsRepository/repository \
+         $HOME/Library/Application\ Support/JetBrains/IdeaIC*/settingsRepository/repository
 do
   if [[ -d "$i" ]]; then
     # Install codestyles

From d06cd93bc67963bec65de64eaf212d73f7365d89 Mon Sep 17 00:00:00 2001
From: Thomas Mahoney <tmahoney@squareup.com>
Date: Wed, 9 Jun 2021 15:43:16 -0400
Subject: [PATCH 17/22] add SUGGEST_NULLABLE_ANNOTATIONS inspection

add ConstantConditions.SUGGEST_NULLABLE_ANNOTATIONS to inspections.

This inspection flags code that mixes `@Nullable` values and
non-`@Nullable` params. Such code is likely erroneous and a common
place for NPEs to hide.
---
 configs/inspection/Square.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/inspection/Square.xml b/configs/inspection/Square.xml
index 361afca..cdbff23 100644
--- a/configs/inspection/Square.xml
+++ b/configs/inspection/Square.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inspections version="1.0" is_locked="false">
   <option name="myName" value="Square" />
+  <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
+    <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="true" />
+  </inspection_tool>
   <inspection_tool class="FallthruInSwitchStatement" enabled="true" level="ERROR" enabled_by_default="true" />
   <inspection_tool class="UnnecessarySemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
 </inspections>

From f2b81b1d87f6c855bed55dae296bddb9bd587dd0 Mon Sep 17 00:00:00 2001
From: Terry Yiu <963907+tyiu@users.noreply.github.com>
Date: Fri, 22 Jul 2022 10:08:57 -0700
Subject: [PATCH 18/22] Exclude property access inspections on assertj
 assertions due to side-effects

---
 configs/inspection/Square.xml | 44 +++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/configs/inspection/Square.xml b/configs/inspection/Square.xml
index cdbff23..a87576b 100644
--- a/configs/inspection/Square.xml
+++ b/configs/inspection/Square.xml
@@ -1,10 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inspections version="1.0" is_locked="false">
+<profile version="1.0" is_locked="false">
   <option name="myName" value="Square" />
   <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
     <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="true" />
+    <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
   </inspection_tool>
   <inspection_tool class="FallthruInSwitchStatement" enabled="true" level="ERROR" enabled_by_default="true" />
   <inspection_tool class="UnnecessarySemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
-</inspections>
-
+  <inspection_tool class="UsePropertyAccessSyntax" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+    <option name="fqNameStrings">
+      <list>
+        <option value="java.net.Socket.getInputStream" />
+        <option value="java.net.Socket.getOutputStream" />
+        <option value="java.net.URLConnection.getInputStream" />
+        <option value="java.net.URLConnection.getOutputStream" />
+        <option value="java.util.concurrent.atomic.AtomicInteger.getAndIncrement" />
+        <option value="java.util.concurrent.atomic.AtomicInteger.getAndDecrement" />
+        <option value="java.util.concurrent.atomic.AtomicInteger.getAcquire" />
+        <option value="java.util.concurrent.atomic.AtomicInteger.getOpaque" />
+        <option value="java.util.concurrent.atomic.AtomicInteger.getPlain" />
+        <option value="java.util.concurrent.atomic.AtomicLong.getAndIncrement" />
+        <option value="java.util.concurrent.atomic.AtomicLong.getAndDecrement" />
+        <option value="java.util.concurrent.atomic.AtomicLong.getAcquire" />
+        <option value="java.util.concurrent.atomic.AtomicLong.getOpaque" />
+        <option value="java.util.concurrent.atomic.AtomicLong.getPlain" />
+        <option value="org.assertj.core.api.AbstractBooleanAssert.isFalse" />
+        <option value="org.assertj.core.api.AbstractBooleanAssert.isNotNull" />
+        <option value="org.assertj.core.api.AbstractBooleanAssert.isTrue" />
+        <option value="org.assertj.core.api.AbstractByteArrayAssert.isNotNull" />
+        <option value="org.assertj.core.api.AbstractDoubleAssert.isNotZero" />
+        <option value="org.assertj.core.api.AbstractDoubleAssert.isZero" />
+        <option value="org.assertj.core.api.AbstractIntegerAssert.isNotZero" />
+        <option value="org.assertj.core.api.AbstractIntegerAssert.isZero" />
+        <option value="org.assertj.core.api.AbstractLongAssert.isNotNull" />
+        <option value="org.assertj.core.api.AbstractLongAssert.isNotZero" />
+        <option value="org.assertj.core.api.AbstractLongAssert.isZero" />
+        <option value="org.assertj.core.api.AbstractStringAssert.isNotNull" />
+        <option value="org.assertj.core.api.IterableAssert.isNotEmpty" />
+        <option value="org.assertj.core.api.ListAssert.isNotEmpty" />
+        <option value="org.assertj.core.api.ListAssert.isNotNull" />
+        <option value="org.assertj.core.api.MapAssert.isNotEmpty" />
+        <option value="org.assertj.core.api.ObjectAssert.isNotNull" />
+      </list>
+    </option>
+  </inspection_tool>
+</profile>

From 1af1c63dc788a3eba36c69ccabadf17184634eb5 Mon Sep 17 00:00:00 2001
From: Kirill Zhukov <zhukov@squareup.com>
Date: Tue, 16 Aug 2022 21:35:28 -0700
Subject: [PATCH 19/22] Fix trailing commas configuration - KTIJ-22516.

ALLOW_TRAILING_COMMA configuration does not currently get picked up by
IJ/AS, it only works if it's set up using legacy `JetCodeStyleSettings`
block. See https://youtrack.jetbrains.com/issue/KTIJ-22516 for more
details, enabling trailing commas via `JetCodeStyleSettings` until the
IDE bug is fixed.
---
 configs/codestyles/Square.xml        | 2 ++
 configs/codestyles/SquareAndroid.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index d7b0a46..ebee07c 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -77,6 +77,8 @@
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
     <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
+    <!-- TODO: remove in favor of `codeStyleSettings` once this is fixed: https://youtrack.jetbrains.com/issue/KTIJ-22516. -->
+    <option name="ALLOW_TRAILING_COMMA" value="true" />
   </JetCodeStyleSettings>
   <SqlCodeStyleSettings>
     <option name="ALIGN_AS_IN_SELECT_STATEMENT" value="false" />
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index cea07c4..e3b6c1e 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -109,6 +109,8 @@
     <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />
     <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     <option name="IF_RPAREN_ON_NEW_LINE" value="true" />
+    <!-- TODO: remove in favor of `codeStyleSettings` once this is fixed: https://youtrack.jetbrains.com/issue/KTIJ-22516. -->
+    <option name="ALLOW_TRAILING_COMMA" value="true" />
   </JetCodeStyleSettings>
   <XML>
     <option name="XML_ALIGN_ATTRIBUTES" value="false" />

From b1ec61befe9a2d65a8376892850c8d87dcf8049e Mon Sep 17 00:00:00 2001
From: Jason Holmes <holmes@squareup.com>
Date: Fri, 6 Jan 2023 10:33:44 -0800
Subject: [PATCH 20/22] Disable new line after multiline when statement

---
 configs/codestyles/SquareAndroid.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index e3b6c1e..19a6fd9 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -260,6 +260,7 @@
     <option name="FIELD_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="2" />
     <option name="ALLOW_TRAILING_COMMA" value="true" />
+    <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="2" />
@@ -418,4 +419,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>

From 66a3fc35ef4851837eac4417d9b2d21a4796d823 Mon Sep 17 00:00:00 2001
From: Ralf Wondratschek <ralf@squareup.com>
Date: Wed, 19 Nov 2025 11:13:55 -0800
Subject: [PATCH 21/22] Explicit Kotlin import layout

Specify an explicit import layout instead of relying on the Kotlin Official default. The Kotlin Official style uses `ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^`. There isn't a reason why these packages should be treated differently. The new explicit import layout changes it to `ij_kotlin_imports_layout = *`, which is for example used by ktfmt, too.
---
 configs/codestyles/SquareAndroid.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 19a6fd9..a099107 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -99,6 +99,11 @@
     <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
   </JavaCodeStyleSettings>
   <JetCodeStyleSettings>
+    <option name="PACKAGES_IMPORT_LAYOUT">
+      <value>
+        <package name="" alias="false" withSubpackages="true" />
+      </value>
+    </option>
     <option name="PACKAGES_TO_USE_STAR_IMPORTS">
       <value />
     </option>

From 832b5d0486366c5e05ff80c371468739ea887f58 Mon Sep 17 00:00:00 2001
From: Ralf Wondratschek <ralf@squareup.com>
Date: Wed, 19 Nov 2025 11:42:49 -0800
Subject: [PATCH 22/22] Deprecate this project

These code styles aren't maintained anymore. Block / Square has adopted [ktfmt](https://github.com/facebook/ktfmt) with its code style. [`.editorconfig`](https://spec.editorconfig.org/index.html) files are a better alternative to share code styles and are supported in Jetbrains IDEs.
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 9ad7c0e..05b1d39 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,14 @@ Java Code Styles
 
 IntelliJ IDEA code style settings for Square's Java and Android projects.
 
+Deprecated
+----------
+
+These code styles aren't maintained anymore. Block / Square has adopted 
+[ktfmt](https://github.com/facebook/ktfmt) with its code style. 
+[`.editorconfig`](https://spec.editorconfig.org/index.html) files are a better alternative to share
+code styles and are supported in Jetbrains IDEs. 
+
 
 Installation
 ------------