Skip to content

Commit 8d0a3a2

Browse files
DenWavDenWav
committed
Update style
1 parent 6de2db1 commit 8d0a3a2

File tree

3 files changed

+77
-17
lines changed

3 files changed

+77
-17
lines changed

‎intellij-style.xml‎

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
<code_scheme name="DemonWavStyle">
2-
<option name="JAVA_INDENT_OPTIONS">
3-
<value>
4-
<option name="INDENT_SIZE" value="4" />
5-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
6-
<option name="TAB_SIZE" value="4" />
7-
<option name="USE_TAB_CHARACTER" value="false" />
8-
<option name="SMART_TABS" value="false" />
9-
<option name="LABEL_INDENT_SIZE" value="0" />
10-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
11-
<option name="USE_RELATIVE_INDENTS" value="false" />
12-
</value>
13-
</option>
1+
<code_scheme name="DemonWavStyle" version="173">
142
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
153
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
164
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -57,10 +45,41 @@
5745
<option name="DOWHILE_BRACE_FORCE" value="3" />
5846
<option name="WHILE_BRACE_FORCE" value="3" />
5947
<option name="FOR_BRACE_FORCE" value="3" />
48+
<GroovyCodeStyleSettings>
49+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2147483647" />
50+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2147483647" />
51+
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
52+
<value />
53+
</option>
54+
<option name="IMPORT_LAYOUT_TABLE">
55+
<value>
56+
<package name="" withSubpackages="true" static="true" />
57+
<emptyLine />
58+
<package name="" withSubpackages="true" static="false" />
59+
</value>
60+
</option>
61+
</GroovyCodeStyleSettings>
6062
<JavaCodeStyleSettings>
6163
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
6264
<option name="ANNOTATION_PARAMETER_WRAP" value="5" />
6365
<option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
66+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
67+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
68+
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
69+
<value>
70+
<package name="com.mumfrey.liteloader.gl.GL" withSubpackages="true" static="true" />
71+
</value>
72+
</option>
73+
<option name="IMPORT_LAYOUT_TABLE">
74+
<value>
75+
<package name="" withSubpackages="true" static="true" />
76+
<emptyLine />
77+
<package name="" withSubpackages="true" static="false" />
78+
</value>
79+
</option>
80+
<option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
81+
<option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
82+
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
6483
</JavaCodeStyleSettings>
6584
<JetCodeStyleSettings>
6685
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
@@ -69,17 +88,44 @@
6988
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
7089
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
7190
</JetCodeStyleSettings>
91+
<codeStyleSettings language="Groovy">
92+
<option name="RIGHT_MARGIN" value="150" />
93+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
94+
<option name="CALL_PARAMETERS_WRAP" value="5" />
95+
<option name="PREFER_PARAMETERS_WRAP" value="true" />
96+
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
97+
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
98+
<option name="METHOD_PARAMETERS_WRAP" value="5" />
99+
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
100+
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
101+
<option name="EXTENDS_LIST_WRAP" value="1" />
102+
<option name="THROWS_LIST_WRAP" value="1" />
103+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
104+
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
105+
<option name="IF_BRACE_FORCE" value="3" />
106+
<option name="WHILE_BRACE_FORCE" value="3" />
107+
<option name="FOR_BRACE_FORCE" value="3" />
108+
<option name="WRAP_ON_TYPING" value="0" />
109+
<indentOptions>
110+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
111+
</indentOptions>
112+
</codeStyleSettings>
72113
<codeStyleSettings language="JAVA">
73-
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
114+
<option name="RIGHT_MARGIN" value="150" />
115+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
74116
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
75-
<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
76117
<option name="CALL_PARAMETERS_WRAP" value="5" />
77118
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
78119
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
79120
<option name="METHOD_PARAMETERS_WRAP" value="5" />
121+
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
122+
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
80123
<option name="RESOURCE_LIST_WRAP" value="5" />
81124
<option name="RESOURCE_LIST_LPAREN_ON_NEXT_LINE" value="true" />
82125
<option name="RESOURCE_LIST_RPAREN_ON_NEXT_LINE" value="true" />
126+
<option name="THROWS_LIST_WRAP" value="1" />
127+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
128+
<option name="THROWS_KEYWORD_WRAP" value="1" />
83129
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
84130
<option name="TERNARY_OPERATION_WRAP" value="5" />
85131
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
@@ -101,6 +147,20 @@
101147
</indentOptions>
102148
</codeStyleSettings>
103149
<codeStyleSettings language="kotlin">
150+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
151+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
152+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
153+
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
154+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
155+
<option name="CALL_PARAMETERS_WRAP" value="5" />
156+
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
157+
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
158+
<option name="METHOD_PARAMETERS_WRAP" value="5" />
159+
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
160+
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
161+
<option name="EXTENDS_LIST_WRAP" value="1" />
162+
<option name="PARAMETER_ANNOTATION_WRAP" value="5" />
163+
<option name="ENUM_CONSTANTS_WRAP" value="2" />
104164
<indentOptions>
105165
<option name="CONTINUATION_INDENT_SIZE" value="4" />
106166
</indentOptions>

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/forge/gradle/tooling/ForgePatcherModelBuilderImpl.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ final class ForgePatcherModelBuilderImpl implements ModelBuilderService {
4949
@Override
5050
ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
5151
return ErrorMessageBuilder.create(
52-
project, e, "MinecraftDev import errors"
52+
project, e, "MinecraftDev import errors"
5353
).withDescription("Unable to build MinecraftDev Forge patcher project configuration")
5454
}
5555
}

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelBuilderImpl.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ final class McpModelBuilderImpl implements ModelBuilderService {
3838
@Override
3939
ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
4040
return ErrorMessageBuilder.create(
41-
project, e, "MinecraftDev import errors"
41+
project, e, "MinecraftDev import errors"
4242
).withDescription("Unable to build MinecraftDev MCP project configuration")
4343
}
4444
}

0 commit comments

Comments
 (0)