From 0aaa2a27ba61b2dd10b1f5042827a160fa2fbc69 Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Mon, 14 Dec 2015 16:00:40 +0000 Subject: [PATCH] Don't align if wrapped. --- .idea/codeStyleSettings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 533cb6461b..18cc2a1b70 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -36,7 +36,6 @@ </AndroidXmlCodeStyleSettings> <JavaCodeStyleSettings> <option name="ANNOTATION_PARAMETER_WRAP" value="1" /> - <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" /> </JavaCodeStyleSettings> <Objective-C-extensions> <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" /> @@ -72,6 +71,8 @@ <codeStyleSettings language="JAVA"> <option name="RIGHT_MARGIN" value="80" /> <option name="ALIGN_MULTILINE_PARAMETERS" value="false" /> + <option name="ALIGN_MULTILINE_RESOURCES" value="false" /> + <option name="ALIGN_MULTILINE_FOR" value="false" /> <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" /> <option name="CALL_PARAMETERS_WRAP" value="1" /> <option name="METHOD_PARAMETERS_WRAP" value="1" /> -- GitLab