Skip to content

Commit 7c21001

Browse files
JakeWhartonJakeWharton
committed
Merge pull request square#19 from edenman/master
Update to new file format
2 parents 59f7bbd + 4540a37 commit 7c21001

File tree

2 files changed

+219
-193
lines changed

2 files changed

+219
-193
lines changed

‎configs/codestyles/Square.xml‎

Lines changed: 147 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<code_scheme name="Square">
32
<option name="USE_SAME_INDENTS" value="true" />
3+
<option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
44
<option name="OTHER_INDENT_OPTIONS">
55
<value>
66
<option name="INDENT_SIZE" value="2" />
@@ -13,7 +13,6 @@
1313
<option name="USE_RELATIVE_INDENTS" value="false" />
1414
</value>
1515
</option>
16-
<option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
1716
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
1817
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
1918
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -33,18 +32,15 @@
3332
<option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
3433
<option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
3534
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
36-
<option name="XML_ALIGN_ATTRIBUTES" value="false" />
3735
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
3836
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
39-
<option name="KEEP_LINE_BREAKS" value="true" />
4037
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
4138
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
4239
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
4340
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
4441
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
4542
<option name="ALIGN_MULTILINE_FOR" value="false" />
4643
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
47-
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
4844
<option name="CALL_PARAMETERS_WRAP" value="1" />
4945
<option name="METHOD_PARAMETERS_WRAP" value="1" />
5046
<option name="RESOURCE_LIST_WRAP" value="1" />
@@ -71,165 +67,162 @@
7167
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
7268
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
7369
<option name="ENUM_CONSTANTS_WRAP" value="1" />
74-
<ADDITIONAL_INDENT_OPTIONS fileType="css">
75-
<option name="INDENT_SIZE" value="2" />
76-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
77-
<option name="TAB_SIZE" value="2" />
78-
<option name="USE_TAB_CHARACTER" value="false" />
79-
<option name="SMART_TABS" value="false" />
80-
<option name="LABEL_INDENT_SIZE" value="0" />
81-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
82-
<option name="USE_RELATIVE_INDENTS" value="false" />
83-
</ADDITIONAL_INDENT_OPTIONS>
70+
<JavaCodeStyleSettings>
71+
<option name="CLASS_NAMES_IN_JAVADOC" value="3" />
72+
</JavaCodeStyleSettings>
73+
<SqlCodeStyleSettings>
74+
<option name="ALIGN_AS_IN_SELECT_STATEMENT" value="false" />
75+
<option name="ALIGN_TYPE_IN_CREATE_STATEMENT" value="false" />
76+
</SqlCodeStyleSettings>
77+
<XML>
78+
<option name="XML_ALIGN_ATTRIBUTES" value="false" />
79+
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
80+
</XML>
8481
<ADDITIONAL_INDENT_OPTIONS fileType="feature">
8582
<option name="INDENT_SIZE" value="2" />
86-
<option name="CONTINUATION_INDENT_SIZE" value="8" />
87-
<option name="TAB_SIZE" value="4" />
88-
<option name="USE_TAB_CHARACTER" value="false" />
89-
<option name="SMART_TABS" value="false" />
90-
<option name="LABEL_INDENT_SIZE" value="0" />
91-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
92-
<option name="USE_RELATIVE_INDENTS" value="false" />
93-
</ADDITIONAL_INDENT_OPTIONS>
94-
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
95-
<option name="INDENT_SIZE" value="2" />
96-
<option name="CONTINUATION_INDENT_SIZE" value="8" />
97-
<option name="TAB_SIZE" value="4" />
98-
<option name="USE_TAB_CHARACTER" value="false" />
99-
<option name="SMART_TABS" value="false" />
100-
<option name="LABEL_INDENT_SIZE" value="0" />
101-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
102-
<option name="USE_RELATIVE_INDENTS" value="false" />
10383
</ADDITIONAL_INDENT_OPTIONS>
10484
<ADDITIONAL_INDENT_OPTIONS fileType="haml">
10585
<option name="INDENT_SIZE" value="2" />
106-
<option name="CONTINUATION_INDENT_SIZE" value="8" />
107-
<option name="TAB_SIZE" value="4" />
108-
<option name="USE_TAB_CHARACTER" value="false" />
109-
<option name="SMART_TABS" value="false" />
110-
<option name="LABEL_INDENT_SIZE" value="0" />
111-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
112-
<option name="USE_RELATIVE_INDENTS" value="false" />
113-
</ADDITIONAL_INDENT_OPTIONS>
114-
<ADDITIONAL_INDENT_OPTIONS fileType="java">
115-
<option name="INDENT_SIZE" value="2" />
116-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
117-
<option name="TAB_SIZE" value="2" />
118-
<option name="USE_TAB_CHARACTER" value="false" />
119-
<option name="SMART_TABS" value="false" />
120-
<option name="LABEL_INDENT_SIZE" value="0" />
121-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
122-
<option name="USE_RELATIVE_INDENTS" value="false" />
123-
</ADDITIONAL_INDENT_OPTIONS>
124-
<ADDITIONAL_INDENT_OPTIONS fileType="js">
125-
<option name="INDENT_SIZE" value="2" />
126-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
127-
<option name="TAB_SIZE" value="2" />
128-
<option name="USE_TAB_CHARACTER" value="false" />
129-
<option name="SMART_TABS" value="false" />
130-
<option name="LABEL_INDENT_SIZE" value="0" />
131-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
132-
<option name="USE_RELATIVE_INDENTS" value="false" />
133-
</ADDITIONAL_INDENT_OPTIONS>
134-
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
135-
<option name="INDENT_SIZE" value="4" />
136-
<option name="CONTINUATION_INDENT_SIZE" value="8" />
137-
<option name="TAB_SIZE" value="4" />
138-
<option name="USE_TAB_CHARACTER" value="false" />
139-
<option name="SMART_TABS" value="false" />
140-
<option name="LABEL_INDENT_SIZE" value="0" />
141-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
142-
<option name="USE_RELATIVE_INDENTS" value="false" />
14386
</ADDITIONAL_INDENT_OPTIONS>
14487
<ADDITIONAL_INDENT_OPTIONS fileType="php">
14588
<option name="INDENT_SIZE" value="2" />
14689
<option name="CONTINUATION_INDENT_SIZE" value="4" />
14790
<option name="TAB_SIZE" value="2" />
148-
<option name="USE_TAB_CHARACTER" value="false" />
149-
<option name="SMART_TABS" value="false" />
150-
<option name="LABEL_INDENT_SIZE" value="0" />
151-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
152-
<option name="USE_RELATIVE_INDENTS" value="false" />
15391
</ADDITIONAL_INDENT_OPTIONS>
15492
<ADDITIONAL_INDENT_OPTIONS fileType="rb">
15593
<option name="INDENT_SIZE" value="2" />
15694
<option name="CONTINUATION_INDENT_SIZE" value="4" />
15795
<option name="TAB_SIZE" value="2" />
158-
<option name="USE_TAB_CHARACTER" value="false" />
159-
<option name="SMART_TABS" value="false" />
160-
<option name="LABEL_INDENT_SIZE" value="0" />
161-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
16296
<option name="USE_RELATIVE_INDENTS" value="true" />
16397
</ADDITIONAL_INDENT_OPTIONS>
16498
<ADDITIONAL_INDENT_OPTIONS fileType="sass">
16599
<option name="INDENT_SIZE" value="2" />
166-
<option name="CONTINUATION_INDENT_SIZE" value="8" />
167-
<option name="TAB_SIZE" value="4" />
168-
<option name="USE_TAB_CHARACTER" value="false" />
169-
<option name="SMART_TABS" value="false" />
170-
<option name="LABEL_INDENT_SIZE" value="0" />
171-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
172-
<option name="USE_RELATIVE_INDENTS" value="false" />
173100
</ADDITIONAL_INDENT_OPTIONS>
174-
<ADDITIONAL_INDENT_OPTIONS fileType="sql">
175-
<option name="INDENT_SIZE" value="2" />
176-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
177-
<option name="TAB_SIZE" value="2" />
178-
<option name="USE_TAB_CHARACTER" value="false" />
179-
<option name="SMART_TABS" value="false" />
180-
<option name="LABEL_INDENT_SIZE" value="0" />
181-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
182-
<option name="USE_RELATIVE_INDENTS" value="false" />
183-
</ADDITIONAL_INDENT_OPTIONS>
184-
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
185-
<option name="INDENT_SIZE" value="2" />
186-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
187-
<option name="TAB_SIZE" value="2" />
188-
<option name="USE_TAB_CHARACTER" value="false" />
189-
<option name="SMART_TABS" value="false" />
190-
<option name="LABEL_INDENT_SIZE" value="0" />
191-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
192-
<option name="USE_RELATIVE_INDENTS" value="false" />
193-
</ADDITIONAL_INDENT_OPTIONS>
194-
<ADDITIONAL_INDENT_OPTIONS fileType="yml">
195-
<option name="INDENT_SIZE" value="2" />
196-
<option name="CONTINUATION_INDENT_SIZE" value="8" />
197-
<option name="TAB_SIZE" value="4" />
198-
<option name="USE_TAB_CHARACTER" value="false" />
199-
<option name="SMART_TABS" value="false" />
200-
<option name="LABEL_INDENT_SIZE" value="0" />
201-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
202-
<option name="USE_RELATIVE_INDENTS" value="false" />
203-
</ADDITIONAL_INDENT_OPTIONS>
204-
<codeStyleSettings language="JAVA">
101+
<codeStyleSettings language="CSS">
205102
<indentOptions>
206103
<option name="INDENT_SIZE" value="2" />
207104
<option name="CONTINUATION_INDENT_SIZE" value="4" />
208105
<option name="TAB_SIZE" value="2" />
209106
</indentOptions>
210107
</codeStyleSettings>
211-
<codeStyleSettings language="JavaScript">
212-
<option name="KEEP_LINE_BREAKS" value="false" />
108+
<codeStyleSettings language="CoffeeScript">
109+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
110+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
111+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
112+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
113+
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
114+
</codeStyleSettings>
115+
<codeStyleSettings language="Groovy">
116+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
117+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
118+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
119+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
120+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
121+
<option name="ALIGN_MULTILINE_FOR" value="false" />
122+
<option name="CALL_PARAMETERS_WRAP" value="1" />
123+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
124+
<option name="EXTENDS_LIST_WRAP" value="1" />
125+
<option name="THROWS_LIST_WRAP" value="1" />
126+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
127+
<option name="THROWS_KEYWORD_WRAP" value="1" />
128+
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
129+
<option name="BINARY_OPERATION_WRAP" value="5" />
130+
<option name="TERNARY_OPERATION_WRAP" value="1" />
131+
<option name="FOR_STATEMENT_WRAP" value="1" />
132+
<option name="ASSIGNMENT_WRAP" value="1" />
133+
<option name="ASSERT_STATEMENT_WRAP" value="1" />
134+
<option name="IF_BRACE_FORCE" value="1" />
135+
<option name="WHILE_BRACE_FORCE" value="1" />
136+
<option name="METHOD_ANNOTATION_WRAP" value="1" />
137+
<option name="CLASS_ANNOTATION_WRAP" value="1" />
138+
<option name="FIELD_ANNOTATION_WRAP" value="1" />
139+
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
140+
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
141+
<option name="ENUM_CONSTANTS_WRAP" value="1" />
142+
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
143+
<indentOptions>
144+
<option name="INDENT_SIZE" value="2" />
145+
</indentOptions>
146+
</codeStyleSettings>
147+
<codeStyleSettings language="HTML">
148+
<indentOptions>
149+
<option name="INDENT_SIZE" value="2" />
150+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
151+
<option name="TAB_SIZE" value="2" />
152+
</indentOptions>
153+
</codeStyleSettings>
154+
<codeStyleSettings language="JAVA">
155+
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
156+
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
213157
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
214158
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
215159
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
216160
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
217161
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
218162
<option name="ALIGN_MULTILINE_FOR" value="false" />
219163
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
164+
<option name="CALL_PARAMETERS_WRAP" value="1" />
165+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
166+
<option name="RESOURCE_LIST_WRAP" value="1" />
167+
<option name="EXTENDS_LIST_WRAP" value="1" />
168+
<option name="THROWS_LIST_WRAP" value="1" />
169+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
170+
<option name="THROWS_KEYWORD_WRAP" value="1" />
220171
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
221172
<option name="BINARY_OPERATION_WRAP" value="5" />
222173
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
174+
<option name="TERNARY_OPERATION_WRAP" value="1" />
223175
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
224-
<option name="WRAP_COMMENTS" value="true" />
176+
<option name="FOR_STATEMENT_WRAP" value="1" />
177+
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
178+
<option name="ASSIGNMENT_WRAP" value="1" />
179+
<option name="ASSERT_STATEMENT_WRAP" value="1" />
225180
<option name="IF_BRACE_FORCE" value="1" />
226181
<option name="DOWHILE_BRACE_FORCE" value="1" />
227182
<option name="WHILE_BRACE_FORCE" value="1" />
228-
<option name="FOR_BRACE_FORCE" value="1" />
229183
<option name="METHOD_ANNOTATION_WRAP" value="1" />
230184
<option name="CLASS_ANNOTATION_WRAP" value="1" />
231185
<option name="FIELD_ANNOTATION_WRAP" value="1" />
186+
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
187+
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
188+
<option name="ENUM_CONSTANTS_WRAP" value="1" />
189+
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
190+
<indentOptions>
191+
<option name="INDENT_SIZE" value="2" />
192+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
193+
<option name="TAB_SIZE" value="2" />
194+
</indentOptions>
195+
</codeStyleSettings>
196+
<codeStyleSettings language="JSON">
197+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
198+
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
199+
</codeStyleSettings>
200+
<codeStyleSettings language="JSPX">
201+
<indentOptions>
202+
<option name="INDENT_SIZE" value="2" />
203+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
204+
<option name="TAB_SIZE" value="2" />
205+
</indentOptions>
206+
</codeStyleSettings>
207+
<codeStyleSettings language="JavaScript">
208+
<option name="KEEP_LINE_BREAKS" value="false" />
209+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
210+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
211+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
212+
<option name="ALIGN_MULTILINE_FOR" value="false" />
213+
<option name="BINARY_OPERATION_WRAP" value="5" />
214+
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
215+
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
216+
<option name="WRAP_COMMENTS" value="true" />
217+
<option name="IF_BRACE_FORCE" value="1" />
218+
<option name="DOWHILE_BRACE_FORCE" value="1" />
219+
<option name="WHILE_BRACE_FORCE" value="1" />
220+
<option name="FOR_BRACE_FORCE" value="1" />
232221
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
222+
<indentOptions>
223+
<option name="INDENT_SIZE" value="2" />
224+
<option name="TAB_SIZE" value="2" />
225+
</indentOptions>
233226
</codeStyleSettings>
234227
<codeStyleSettings language="PHP">
235228
<option name="KEEP_LINE_BREAKS" value="false" />
@@ -252,5 +245,37 @@
252245
<option name="FIELD_ANNOTATION_WRAP" value="1" />
253246
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
254247
</codeStyleSettings>
255-
</code_scheme>
256-
248+
<codeStyleSettings language="SQL">
249+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
250+
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
251+
</codeStyleSettings>
252+
<codeStyleSettings language="TypeScript">
253+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
254+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
255+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
256+
<option name="ALIGN_MULTILINE_FOR" value="false" />
257+
<option name="CALL_PARAMETERS_WRAP" value="1" />
258+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
259+
<option name="EXTENDS_LIST_WRAP" value="1" />
260+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
261+
<option name="BINARY_OPERATION_WRAP" value="5" />
262+
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
263+
<option name="TERNARY_OPERATION_WRAP" value="1" />
264+
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
265+
<option name="FOR_STATEMENT_WRAP" value="1" />
266+
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
267+
<option name="ASSIGNMENT_WRAP" value="1" />
268+
<option name="WRAP_COMMENTS" value="true" />
269+
<option name="IF_BRACE_FORCE" value="1" />
270+
<option name="DOWHILE_BRACE_FORCE" value="1" />
271+
<option name="WHILE_BRACE_FORCE" value="1" />
272+
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
273+
</codeStyleSettings>
274+
<codeStyleSettings language="XML">
275+
<indentOptions>
276+
<option name="INDENT_SIZE" value="2" />
277+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
278+
<option name="TAB_SIZE" value="2" />
279+
</indentOptions>
280+
</codeStyleSettings>
281+
</code_scheme>

0 commit comments

Comments
 (0)