diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml index 6b126371337..5f354d6682d 100644 --- a/.github/workflows/tests-code.yml +++ b/.github/workflows/tests-code.yml @@ -121,7 +121,7 @@ jobs: - uses: koppor/intellij-idea-format@update-to-latest-intellij with: file-mask: "*.java" - settings-file: "config/IntelliJ Code Style.xml" + settings-file: ".idea/codeStyles/Project.xml" # job should fail in case there are changes - name: Check if any files changed run: git diff --exit-code diff --git a/.gitignore b/.gitignore index 2f01ba4fb6a..b187fa133e6 100644 --- a/.gitignore +++ b/.gitignore @@ -71,9 +71,6 @@ gradle.properties .idea/workspace.xml .idea/checkstyleidea-libs -# only contains the reference name -.idea/codeStyles/codeStyleConfig.xml - # references JDK_24 and the JDK name - high risk for conflicts .idea/misc.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000000..ba15d402c02 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000000..79ee123c2b2 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/config/IntelliJ Code Style.xml b/config/IntelliJ Code Style.xml deleted file mode 100644 index dbe682cecbb..00000000000 --- a/config/IntelliJ Code Style.xml +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-04-import-checkstyle.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-04-import-checkstyle.png deleted file mode 100644 index 9c81bdd8051..00000000000 Binary files a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-04-import-checkstyle.png and /dev/null differ diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-05-select-checkstyle-xml-file.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-05-select-checkstyle-xml-file.png deleted file mode 100644 index d2b9b4f6e6d..00000000000 Binary files a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-05-select-checkstyle-xml-file.png and /dev/null differ diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-06-code-style-import-as-jabref.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-06-code-style-import-as-jabref.png deleted file mode 100644 index 2f27ae80779..00000000000 Binary files a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/13-06-code-style-import-as-jabref.png and /dev/null differ diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md index f2773bde466..7b092fadc31 100644 --- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md +++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md @@ -37,36 +37,6 @@ Click on "Restart" to finally restart. Wait for IntelliJ coming up again. -## Put JabRef's code style configuration in place - -Go to **File > Settings... > Editor > Code Style** - -Click on the settings wheel (next to the scheme chooser), -then click "Import Scheme >", -then click "IntelliJ IDEA code style XML" - -{% figure caption:"Location of “Import Scheme > IntelliJ IDEA code style XML”" %} -![Location of IntelliJ IDEA code style XML](13-04-import-checkstyle.png) -{% endfigure %} - -You have to browse for the directory `config` in JabRef's code. -There is an `IntelliJ Code Style.xml`. - -{% figure caption:"Browsing for `config/IntelliJ Code Style.xml`" %} -![Browsing for config/IntelliJ Code Style.xml](13-05-select-checkstyle-xml-file.png) -{% endfigure %} - -Click "OK". - -At following dialog is "Import Scheme". -Click there "OK", too. - -{% figure caption:"Import to JabRef" %} -![Import to JabRef](13-06-code-style-import-as-jabref.png) -{% endfigure %} - -Click on "Apply" to store the preferences. - ## Have auto format working properly in JavaDoc To have auto format working properly in the context of JavaDoc and line wrapping, "Wrap at right margin" has to be disabled. Details are found in [IntelliJ issue 240517](https://youtrack.jetbrains.com/issue/IDEA-240517).