From b1b03a3e310bb23c90c00025ee88b989dea25e9e Mon Sep 17 00:00:00 2001
From: tomalloc <tomalloc@163.com>
Date: Mon, 17 Jul 2017 16:03:48 +0800
Subject: [PATCH 1/2] add editor setting

---
 configs/codestyles/Square.xml          | 4 +++-
 configs/options/code.style.schemes.xml | 5 +++++
 configs/options/editor.codeinsight.xml | 9 +++++++++
 configs/options/editor.xml             | 6 ++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 configs/options/code.style.schemes.xml
 create mode 100644 configs/options/editor.xml

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 202efce..07460aa 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -13,6 +13,7 @@
       <option name="USE_RELATIVE_INDENTS" value="false" />
     </value>
   </option>
+  <option name="LINE_SEPARATOR" value="&#10;" />
   <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">
@@ -25,7 +26,8 @@
       <package name="" withSubpackages="true" static="true" />
     </value>
   </option>
-  <option name="RIGHT_MARGIN" value="100" />
+  <option name="RIGHT_MARGIN" value="120" />
+  <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
   <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" />
diff --git a/configs/options/code.style.schemes.xml b/configs/options/code.style.schemes.xml
new file mode 100644
index 0000000..6eb056a
--- /dev/null
+++ b/configs/options/code.style.schemes.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="CodeStyleSchemeSettings">
+    <option name="CURRENT_SCHEME_NAME" value="Square" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/configs/options/editor.codeinsight.xml b/configs/options/editor.codeinsight.xml
index 8733999..df9d604 100644
--- a/configs/options/editor.codeinsight.xml
+++ b/configs/options/editor.codeinsight.xml
@@ -1,5 +1,10 @@
 <application>
+  <component name="CodeFoldingSettings">
+    <option name="COLLAPSE_METHODS" value="true" />
+  </component>
   <component name="CodeInsightSettings">
+    <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
+    <option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
     <EXCLUDED_PACKAGE NAME="autovalue.shaded" />
     <EXCLUDED_PACKAGE NAME="avro.shaded" />
     <EXCLUDED_PACKAGE NAME="com.beust.jcommander.internal" />
@@ -14,4 +19,8 @@
     <EXCLUDED_PACKAGE NAME="org.mockito.internal.verification.VerificationModeFactory" />
     <EXCLUDED_PACKAGE NAME="junit.framework.Assert" />
   </component>
+  <component name="JavaCodeFoldingSettings">
+    <option name="collapseInnerClasses" value="true" />
+    <option name="COLLAPSE_INNER_CLASSES" value="true" />
+  </component>
 </application>
diff --git a/configs/options/editor.xml b/configs/options/editor.xml
new file mode 100644
index 0000000..505e719
--- /dev/null
+++ b/configs/options/editor.xml
@@ -0,0 +1,6 @@
+<application>
+  <component name="EditorSettings">
+    <option name="ARE_LINE_NUMBERS_SHOWN" value="true" />
+    <option name="IS_WHITESPACES_SHOWN" value="true" />
+  </component>
+</application>
\ No newline at end of file

From 4967c0a10676c3284c427f9537bf951e44703b84 Mon Sep 17 00:00:00 2001
From: tomalloc <tomalloc@163.com>
Date: Tue, 18 Jul 2017 14:29:53 +0800
Subject: [PATCH 2/2] remove code folding

---
 configs/options/editor.codeinsight.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/configs/options/editor.codeinsight.xml b/configs/options/editor.codeinsight.xml
index df9d604..7015b6f 100644
--- a/configs/options/editor.codeinsight.xml
+++ b/configs/options/editor.codeinsight.xml
@@ -19,8 +19,4 @@
     <EXCLUDED_PACKAGE NAME="org.mockito.internal.verification.VerificationModeFactory" />
     <EXCLUDED_PACKAGE NAME="junit.framework.Assert" />
   </component>
-  <component name="JavaCodeFoldingSettings">
-    <option name="collapseInnerClasses" value="true" />
-    <option name="COLLAPSE_INNER_CLASSES" value="true" />
-  </component>
 </application>