|
5 | 5 | <option name="SMART_TABS" value="true" /> |
6 | 6 | </value> |
7 | 7 | </option> |
8 | | - <option name="LINE_SEPARATOR" value="
" /> |
| 8 | + <option name="LINE_SEPARATOR" value=" " /> |
9 | 9 | <option name="RIGHT_MARGIN" value="100" /> |
10 | | - <option name="HTML_ATTRIBUTE_WRAP" value="0" /> |
11 | | - <option name="HTML_TEXT_WRAP" value="0" /> |
12 | | - <option name="HTML_KEEP_LINE_BREAKS" value="false" /> |
13 | | - <option name="HTML_KEEP_LINE_BREAKS_IN_TEXT" value="false" /> |
14 | | - <option name="HTML_ALIGN_ATTRIBUTES" value="false" /> |
15 | | - <option name="HTML_ELEMENTS_TO_REMOVE_NEW_LINE_BEFORE" value="" /> |
16 | | - <option name="HTML_INLINE_ELEMENTS" value="abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,q,s,samp,select,span,strike,strong,sub,sup,textarea,tt,u,var" /> |
17 | | - <option name="HTML_DONT_ADD_BREAKS_IF_INLINE_CONTENT" value="title,h1,h2,h3,h4,h5,h6,p,a,br" /> |
18 | 10 | <option name="FORMATTER_TAGS_ENABLED" value="true" /> |
19 | 11 | <option name="SOFT_MARGINS" value="80" /> |
20 | 12 | <CssCodeStyleSettings> |
|
33 | 25 | <option name="HTML_DONT_ADD_BREAKS_IF_INLINE_CONTENT" value="title,h1,h2,h3,h4,h5,h6,a,br" /> |
34 | 26 | <option name="HTML_ENFORCE_QUOTES" value="true" /> |
35 | 27 | </HTMLCodeStyleSettings> |
| 28 | + <JSCodeStyleSettings version="0"> |
| 29 | + <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" /> |
| 30 | + </JSCodeStyleSettings> |
| 31 | + <LessCodeStyleSettings> |
| 32 | + <option name="HEX_COLOR_LOWER_CASE" value="true" /> |
| 33 | + <option name="HEX_COLOR_SHORT_FORMAT" value="true" /> |
| 34 | + </LessCodeStyleSettings> |
36 | 35 | <PHPCodeStyleSettings> |
37 | | - <option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" /> |
38 | | - <option name="ALIGN_PHPDOC_COMMENTS" value="true" /> |
39 | 36 | <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" /> |
40 | 37 | <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" /> |
41 | 38 | <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" /> |
42 | 39 | <option name="PHPDOC_WRAP_LONG_LINES" value="true" /> |
43 | | - <option name="THROWS_WEIGHT" value="3" /> |
44 | | - <option name="RETURN_WEIGHT" value="4" /> |
45 | | - <option name="SEE_WEIGHT" value="1" /> |
46 | | - <option name="VAR_WEIGHT" value="2" /> |
| 40 | + <option name="ANONYMOUS_BRACE_STYLE" value="2" /> |
| 41 | + <option name="THROWS_WEIGHT" value="5" /> |
| 42 | + <option name="PARAM_WEIGHT" value="2" /> |
| 43 | + <option name="RETURN_WEIGHT" value="6" /> |
| 44 | + <option name="SEE_WEIGHT" value="3" /> |
| 45 | + <option name="SINCE_WEIGHT" value="1" /> |
| 46 | + <option name="TODO_WEIGHT" value="0" /> |
| 47 | + <option name="VAR_WEIGHT" value="4" /> |
47 | 48 | <option name="GROUP_USE_WRAP" value="0" /> |
48 | 49 | <option name="LOWER_CASE_BOOLEAN_CONST" value="true" /> |
49 | 50 | <option name="LOWER_CASE_NULL_CONST" value="true" /> |
50 | 51 | <option name="ELSE_IF_STYLE" value="COMBINE" /> |
51 | 52 | <option name="FIELDS_DEFAULT_VISIBILITY" value="protected" /> |
52 | | - <option name="VARIABLE_NAMING_STYLE" value="SNAKE_CASE" /> |
| 53 | + <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" /> |
53 | 54 | <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" /> |
54 | 55 | <option name="KEEP_BLANK_LINES_AFTER_LBRACE" value="0" /> |
55 | | - <option name="SPACE_BEFORE_UNARY_NOT" value="true" /> |
56 | | - <option name="SPACE_AFTER_UNARY_NOT" value="true" /> |
| 56 | + <option name="SPACE_BEFORE_SHORT_CLOSURE_LEFT_PARENTHESIS" value="true" /> |
57 | 57 | <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" /> |
58 | 58 | <option name="SPACE_BEFORE_COLON_IN_RETURN_TYPE" value="true" /> |
| 59 | + <option name="SPACES_AROUND_PIPE_IN_UNION_TYPE" value="true" /> |
59 | 60 | <option name="NAMESPACE_BRACE_STYLE" value="2" /> |
| 61 | + <option name="ATTRIBUTES_WRAP" value="2" /> |
60 | 62 | </PHPCodeStyleSettings> |
61 | 63 | <ScssCodeStyleSettings> |
62 | 64 | <option name="HEX_COLOR_LOWER_CASE" value="true" /> |
63 | 65 | <option name="HEX_COLOR_SHORT_FORMAT" value="true" /> |
64 | 66 | </ScssCodeStyleSettings> |
| 67 | + <SqlCodeStyleSettings version="7"> |
| 68 | + <option name="KEYWORD_CASE" value="2" /> |
| 69 | + <option name="TYPE_CASE" value="1" /> |
| 70 | + <option name="CUSTOM_TYPE_CASE" value="1" /> |
| 71 | + <option name="QUOTE_IDENTIFIER" value="2" /> |
| 72 | + <option name="QUOTE_TYPE" value="31" /> |
| 73 | + <option name="QUERY_EL_COMMA" value="2" /> |
| 74 | + <option name="QUERY_ALIGN_ELEMENTS" value="false" /> |
| 75 | + <option name="SET_ALIGN_EQUAL_SIGN" value="false" /> |
| 76 | + <option name="TABLE_TYPES_ALIGN" value="false" /> |
| 77 | + <option name="TABLE_DEFAULTS_ALIGN" value="false" /> |
| 78 | + <option name="TABLE_NULLABILITIES_ALIGN" value="false" /> |
| 79 | + <option name="ROUTINE_ARG_CONTENT" value="2" /> |
| 80 | + <option name="ROUTINE_ARG_CLOSING" value="2" /> |
| 81 | + <option name="ROUTINE_ARG_WRAP" value="0" /> |
| 82 | + <option name="ROUTINE_ARG_COMMA" value="2" /> |
| 83 | + <option name="IMP_COMMON_KEEP_BLANK_LINES_IN_CODE" value="1" /> |
| 84 | + <option name="IMP_DECLARE_ALIGN_TYPE" value="false" /> |
| 85 | + <option name="IMP_DECLARE_ALIGN_EQ" value="false" /> |
| 86 | + </SqlCodeStyleSettings> |
65 | 87 | <XML> |
66 | | - <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> |
| 88 | + <option name="XML_KEEP_BLANK_LINES" value="1" /> |
67 | 89 | </XML> |
68 | | - <editorconfig> |
69 | | - <option name="ENABLED" value="false" /> |
70 | | - </editorconfig> |
71 | 90 | <codeStyleSettings language="CSS"> |
72 | | - <option name="KEEP_BLANK_LINES_IN_CODE" value="1" /> |
| 91 | + <option name="KEEP_BLANK_LINES_IN_CODE" value="0" /> |
73 | 92 | <indentOptions> |
74 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
75 | 93 | <option name="SMART_TABS" value="true" /> |
76 | 94 | </indentOptions> |
77 | 95 | <arrangement> |
|
89 | 107 | </codeStyleSettings> |
90 | 108 | <codeStyleSettings language="HTML"> |
91 | 109 | <indentOptions> |
92 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
93 | 110 | <option name="SMART_TABS" value="true" /> |
94 | 111 | </indentOptions> |
95 | 112 | </codeStyleSettings> |
96 | 113 | <codeStyleSettings language="JSON"> |
97 | 114 | <indentOptions> |
98 | 115 | <option name="INDENT_SIZE" value="4" /> |
99 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
100 | 116 | </indentOptions> |
101 | 117 | </codeStyleSettings> |
102 | 118 | <codeStyleSettings language="JavaScript"> |
| 119 | + <option name="KEEP_BLANK_LINES_IN_CODE" value="0" /> |
| 120 | + <option name="BLANK_LINES_AFTER_IMPORTS" value="0" /> |
103 | 121 | <indentOptions> |
104 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
105 | 122 | <option name="SMART_TABS" value="true" /> |
106 | 123 | </indentOptions> |
107 | 124 | </codeStyleSettings> |
| 125 | + <codeStyleSettings language="LESS"> |
| 126 | + <option name="KEEP_BLANK_LINES_IN_CODE" value="0" /> |
| 127 | + <indentOptions> |
| 128 | + <option name="INDENT_SIZE" value="4" /> |
| 129 | + </indentOptions> |
| 130 | + </codeStyleSettings> |
108 | 131 | <codeStyleSettings language="PHP"> |
109 | 132 | <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" /> |
110 | 133 | <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" /> |
111 | 134 | <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="0" /> |
112 | | - <option name="KEEP_BLANK_LINES_IN_CODE" value="0" /> |
| 135 | + <option name="KEEP_BLANK_LINES_IN_CODE" value="1" /> |
113 | 136 | <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" /> |
114 | 137 | <option name="BLANK_LINES_BEFORE_PACKAGE" value="0" /> |
115 | 138 | <option name="BLANK_LINES_AFTER_PACKAGE" value="1" /> |
116 | 139 | <option name="ALIGN_MULTILINE_PARAMETERS" value="false" /> |
117 | 140 | <option name="ALIGN_MULTILINE_FOR" value="false" /> |
118 | 141 | <option name="SPACE_AFTER_TYPE_CAST" value="true" /> |
119 | | - <option name="CALL_PARAMETERS_WRAP" value="1" /> |
120 | | - <option name="METHOD_PARAMETERS_WRAP" value="5" /> |
121 | 142 | <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> |
122 | 143 | <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> |
123 | 144 | <option name="METHOD_CALL_CHAIN_WRAP" value="5" /> |
124 | 145 | <option name="TERNARY_OPERATION_WRAP" value="1" /> |
125 | 146 | <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" /> |
126 | | - <option name="FOR_STATEMENT_WRAP" value="1" /> |
127 | 147 | <option name="ARRAY_INITIALIZER_WRAP" value="5" /> |
128 | 148 | <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" /> |
129 | 149 | <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" /> |
|
132 | 152 | <option name="WHILE_BRACE_FORCE" value="3" /> |
133 | 153 | <option name="FOR_BRACE_FORCE" value="3" /> |
134 | 154 | <indentOptions> |
135 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
136 | 155 | <option name="SMART_TABS" value="true" /> |
137 | 156 | </indentOptions> |
138 | 157 | <arrangement> |
|
195 | 214 | </rules> |
196 | 215 | </arrangement> |
197 | 216 | </codeStyleSettings> |
| 217 | + <codeStyleSettings language="SASS"> |
| 218 | + <option name="KEEP_BLANK_LINES_IN_CODE" value="0" /> |
| 219 | + <indentOptions> |
| 220 | + <option name="INDENT_SIZE" value="4" /> |
| 221 | + </indentOptions> |
| 222 | + </codeStyleSettings> |
198 | 223 | <codeStyleSettings language="SCSS"> |
199 | | - <option name="KEEP_BLANK_LINES_IN_CODE" value="1" /> |
| 224 | + <option name="KEEP_BLANK_LINES_IN_CODE" value="0" /> |
200 | 225 | <indentOptions> |
201 | 226 | <option name="INDENT_SIZE" value="4" /> |
202 | 227 | <option name="CONTINUATION_INDENT_SIZE" value="4" /> |
203 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
204 | 228 | <option name="SMART_TABS" value="true" /> |
205 | 229 | </indentOptions> |
206 | 230 | <arrangement> |
|
216 | 240 | </rules> |
217 | 241 | </arrangement> |
218 | 242 | </codeStyleSettings> |
| 243 | + <codeStyleSettings language="SQL"> |
| 244 | + <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" /> |
| 245 | + </codeStyleSettings> |
| 246 | + <codeStyleSettings language="Shell Script"> |
| 247 | + <indentOptions> |
| 248 | + <option name="INDENT_SIZE" value="4" /> |
| 249 | + <option name="TAB_SIZE" value="4" /> |
| 250 | + </indentOptions> |
| 251 | + </codeStyleSettings> |
219 | 252 | <codeStyleSettings language="XML"> |
220 | 253 | <indentOptions> |
221 | | - <option name="USE_TAB_CHARACTER" value="true" /> |
222 | 254 | <option name="SMART_TABS" value="true" /> |
223 | 255 | </indentOptions> |
224 | 256 | </codeStyleSettings> |
|
0 commit comments