This is an automated email from the ASF dual-hosted git repository.
mmuzaf pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2ed4c25753 Move the code style configuration from the .idea/codeStyles
to the ide/idea folder
2ed4c25753 is described below
commit 2ed4c25753f70c93e2b07b7df3a4ad3dd101aaec
Author: Maxim Muzafarov <[email protected]>
AuthorDate: Mon Jan 19 16:51:24 2026 +0100
Move the code style configuration from the .idea/codeStyles to the ide/idea
folder
Patch by Maxim Muzafarov; reviewed by Stefan Miklosovic for CASSANDRA-21124
---
.gitignore | 2 -
build.xml | 6 +-
ide/idea/codeStyles/Project.xml | 315 ++++++++++++++++++++++++++++++++
ide/idea/codeStyles/codeStyleConfig.xml | 5 +
4 files changed, 321 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index c8cd6ac29a..88e917bbb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,6 @@ debian/files
# IntelliJ
.idea/
-!.idea/codeStyles/codeStyleConfig.xml
-!.idea/codeStyles/Project.xml
*.eml
**/*.iml
*.ipr
diff --git a/build.xml b/build.xml
index 918c8f86e0..0b6dbf54ca 100644
--- a/build.xml
+++ b/build.xml
@@ -2131,11 +2131,7 @@
<!-- Generate IDEA project description files -->
<target name="generate-idea-files"
depends="init,resolver-dist-lib,gen-cql3-grammar,generate-jflex-java,_createVersionPropFile"
description="Generate IDEA files">
- <delete>
- <fileset dir=".idea">
- <exclude name="codeStyles/**"/>
- </fileset>
- </delete>
+ <delete dir=".idea"/>
<delete file="${eclipse.project.name}.iml"/>
<mkdir dir=".idea"/>
<mkdir dir=".idea/libraries"/>
diff --git a/ide/idea/codeStyles/Project.xml b/ide/idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..afcd5ec497
--- /dev/null
+++ b/ide/idea/codeStyles/Project.xml
@@ -0,0 +1,315 @@
+<component name="ProjectCodeStyleConfiguration">
+ <code_scheme name="Project" version="173">
+ <option name="BRACE_STYLE" value="2" />
+ <option name="CLASS_BRACE_STYLE" value="2" />
+ <option name="METHOD_BRACE_STYLE" value="2" />
+ <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_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <JavaCodeStyleSettings>
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+ <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+ <value />
+ </option>
+ <option name="IMPORT_LAYOUT_TABLE">
+ <value>
+ <package name="java" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="com" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="net" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="accord" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org.apache.cassandra" withSubpackages="true"
static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="true" />
+ </value>
+ </option>
+ </JavaCodeStyleSettings>
+ <codeStyleSettings language="JAVA">
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+ <option name="BRACE_STYLE" value="2" />
+ <option name="CLASS_BRACE_STYLE" value="2" />
+ <option name="METHOD_BRACE_STYLE" value="2" />
+ <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_CHAINED_METHODS" value="true" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_THROWS_KEYWORD" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true"
/>
+ <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <indentOptions>
+ <option name="CONTINUATION_INDENT_SIZE" value="0" />
+ <option name="USE_RELATIVE_INDENTS" value="true" />
+ </indentOptions>
+ <arrangement>
+ <rules>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PUBLIC />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PROTECTED />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PACKAGE_PRIVATE />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PRIVATE />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PUBLIC />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PROTECTED />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PACKAGE_PRIVATE />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PRIVATE />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PUBLIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PROTECTED />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PACKAGE_PRIVATE />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <FINAL />
+ <PRIVATE />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PUBLIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PROTECTED />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PACKAGE_PRIVATE />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <FIELD />
+ <PRIVATE />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <FIELD />
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <CONSTRUCTOR />
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <METHOD />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <METHOD />
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <ENUM />
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <INTERFACE />
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <CLASS />
+ <STATIC />
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <CLASS />
+ </match>
+ </rule>
+ </section>
+ </rules>
+ </arrangement>
+ </codeStyleSettings>
+ </code_scheme>
+</component>
\ No newline at end of file
diff --git a/ide/idea/codeStyles/codeStyleConfig.xml
b/ide/idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000000..0f7bc519db
--- /dev/null
+++ b/ide/idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+ <state>
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+ </state>
+</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
