Skip to content

NoORM IntelliJ styles update #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 12, 2018
Merged

NoORM IntelliJ styles update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b6b57b
Update the format of the IntelliJ code style settings file for OGM
yrodiere Feb 12, 2018
198f4ac
Update the format of the IntelliJ code style settings file for ORM
yrodiere Feb 12, 2018
37057bd
Rename the OGM code style to "noorm" codestyles
yrodiere Feb 12, 2018
93b0e1e
Do not align on the left parenthesis when wrapping method call parame…
yrodiere Feb 12, 2018
08dc82b
Always use braces, even for one-line if statements, in NoORM projects
yrodiere Feb 12, 2018
f6cf107
Use spaces within try-with-resources in NoORM projects
yrodiere Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 44 additions & 52 deletions intellij-14/hibernate_ogm.xml → intellij-14/hibernate_noorm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,9 @@
<code_scheme name="hibernate-ogm-style">
<code_scheme name="hibernate-noorm-style" version="173">
<option name="OTHER_INDENT_OPTIONS">
<value>
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="true" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="" withSubpackages="true" static="true" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate.testing" withSubpackages="true" static="false" />
<package name="org.hibernate.test" withSubpackages="true" static="false" />
<package name="org.junit" withSubpackages="true" static="false" />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.infinispan" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.jboss" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.logicalcobwebs" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.osgi" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.slf4j" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
<option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
<option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
<option name="JD_PRESERVE_LINE_FEEDS" value="true" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
Expand Down Expand Up @@ -78,7 +34,45 @@
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />

<JavaCodeStyleSettings>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="" withSubpackages="true" static="true" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate.testing" withSubpackages="true" static="false" />
<package name="org.hibernate.test" withSubpackages="true" static="false" />
<package name="org.junit" withSubpackages="true" static="false" />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.infinispan" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.jboss" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.logicalcobwebs" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.osgi" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.slf4j" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
<option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
<option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
<option name="JD_PRESERVE_LINE_FEEDS" value="true" />
</JavaCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
Expand All @@ -88,19 +82,19 @@
<ADDITIONAL_INDENT_OPTIONS fileType="yml">
<option name="INDENT_SIZE" value="2" />
</ADDITIONAL_INDENT_OPTIONS>

<codeStyleSettings language="JAVA">
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_RESOURCES" value="false" />
<option name="ALIGN_MULTILINE_FOR" value="false" />
<option name="SPACE_WITHIN_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_IF_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_FOR_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_TRY_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_SWITCH_PARENTHESES" value="true" />
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
Expand All @@ -118,14 +112,12 @@
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>

</code_scheme>
</code_scheme>
107 changes: 50 additions & 57 deletions intellij-14/hibernate_orm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,9 @@
<code_scheme name="hibernate-style">
<code_scheme name="hibernate-style" version="173">
<option name="OTHER_INDENT_OPTIONS">
<value>
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="true" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="java" withSubpackages="true" static="false" />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="com.mchange" withSubpackages="true" static="false" />
<emptyLine />
<package name="javassist" withSubpackages="true" static="false" />
<emptyLine />
<package name="net.sf.ehcache" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.apache.maven" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.gradle" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate.testing" withSubpackages="true" static="false" />
<package name="org.hibernate.test" withSubpackages="true" static="false" />
<package name="org.junit" withSubpackages="true" static="false" />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.infinispan" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.jboss" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.logicalcobwebs" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.osgi" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.slf4j" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="true" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
<option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
<option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
<option name="JD_PRESERVE_LINE_FEEDS" value="true" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
Expand Down Expand Up @@ -108,6 +54,55 @@
</value>
</option>
</GroovyCodeStyleSettings>
<JavaCodeStyleSettings>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="java" withSubpackages="true" static="false" />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="com.mchange" withSubpackages="true" static="false" />
<emptyLine />
<package name="javassist" withSubpackages="true" static="false" />
<emptyLine />
<package name="net.sf.ehcache" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.apache.maven" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.gradle" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.hibernate.testing" withSubpackages="true" static="false" />
<package name="org.hibernate.test" withSubpackages="true" static="false" />
<package name="org.junit" withSubpackages="true" static="false" />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.infinispan" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.jboss" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.logicalcobwebs" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.osgi" withSubpackages="true" static="false" />
<emptyLine />
<package name="org.slf4j" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="true" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
<option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
<option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
<option name="JD_PRESERVE_LINE_FEEDS" value="true" />
</JavaCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
Expand Down Expand Up @@ -143,7 +138,6 @@
<option name="IF_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
Expand Down Expand Up @@ -181,7 +175,6 @@
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
Expand Down