Skip to content

Commit fdf9215

Browse files
committed
1 parent 3356374 commit fdf9215

File tree

2 files changed

+34
-8
lines changed

2 files changed

+34
-8
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/org/mediawiki/MediaWikiPhpPredefinedCodeStyle.java

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.jetbrains.php.lang.PhpFileType;
77
import com.jetbrains.php.lang.PhpLanguage;
88
import com.jetbrains.php.lang.formatter.PhpCodeStyleSettings;
9+
import com.jetbrains.php.refactoring.PhpNameStyle;
910

1011
/**
1112
* @author Reedy
@@ -47,19 +48,40 @@ public void apply(CodeStyleSettings settings) {
4748
commonSettings.FOR_BRACE_FORCE = 3;
4849
commonSettings.DOWHILE_BRACE_FORCE = 3;
4950
commonSettings.WHILE_BRACE_FORCE = 3;
50-
51-
// Chop down if long
51+
5252
commonSettings.ARRAY_INITIALIZER_WRAP = 2;
53-
commonSettings.CALL_PARAMETERS_WRAP = 2;
53+
commonSettings.ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE = true;
54+
commonSettings.ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE = true;
55+
56+
commonSettings.CALL_PARAMETERS_WRAP = 5;
57+
commonSettings.METHOD_PARAMETERS_WRAP = 5;
58+
59+
commonSettings.EXTENDS_KEYWORD_WRAP = 1;
60+
commonSettings.EXTENDS_LIST_WRAP = 5;
61+
62+
commonSettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE = true;
63+
commonSettings.CALL_PARAMETERS_RPAREN_ON_NEXT_LINE = true;
5464

55-
// Wrap if long
56-
commonSettings.METHOD_CALL_CHAIN_WRAP = 1;
65+
commonSettings.METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE = true;
66+
commonSettings.METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE = true;
67+
68+
commonSettings.METHOD_CALL_CHAIN_WRAP = 5;
69+
commonSettings.BINARY_OPERATION_WRAP = 5;
70+
commonSettings.TERNARY_OPERATION_WRAP = 1;
71+
commonSettings.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE = true;
72+
73+
commonSettings.FOR_STATEMENT_WRAP = 1;
74+
commonSettings.FOR_STATEMENT_LPAREN_ON_NEXT_LINE = true;
75+
commonSettings.FOR_STATEMENT_RPAREN_ON_NEXT_LINE = true;
5776

5877
// Hard wrap at 120 characters
5978
commonSettings.RIGHT_MARGIN = 120;
79+
80+
// Doesn't seem to exist?
81+
// commonSettings.SOFT_MARGINS = 100;
6082

61-
// Keep line breaks when reformatting
62-
commonSettings.KEEP_LINE_BREAKS = true;
83+
// Don't keep line breaks when reformatting
84+
commonSettings.KEEP_LINE_BREAKS = false;
6385

6486
PhpCodeStyleSettings phpSettings = settings.getCustomSettings(PhpCodeStyleSettings.class);
6587
phpSettings.LOWER_CASE_BOOLEAN_CONST = true;
@@ -68,11 +90,15 @@ public void apply(CodeStyleSettings settings) {
6890
phpSettings.KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE = true;
6991
phpSettings.SPACE_AFTER_COLON_IN_RETURN_TYPE = true;
7092
phpSettings.SPACE_BEFORE_COLON_IN_RETURN_TYPE = true;
93+
phpSettings.IF_LPAREN_ON_NEXT_LINE = true;
94+
phpSettings.IF_RPAREN_ON_NEXT_LINE = true;
95+
phpSettings.VARIABLE_NAMING_STYLE = PhpNameStyle.Style.CAMEL_CASE;
7196

7297
phpSettings.PHPDOC_BLANK_LINE_BEFORE_TAGS = true;
7398
phpSettings.PHPDOC_KEEP_BLANK_LINES = true;
7499
phpSettings.PHPDOC_BLANK_LINES_AROUND_PARAMETERS = true;
75100
phpSettings.PHPDOC_WRAP_LONG_LINES = true;
101+
phpSettings.SORT_PHPDOC_ELEMENTS = false;
76102

77103
CodeStyleSettings.IndentOptions indentOptions = settings.getIndentOptions(PhpFileType.INSTANCE);
78104
indentOptions.USE_TAB_CHARACTER = true;

0 commit comments

Comments
 (0)