Skip to content

Commit c32e9b1

Browse files
authored
Address EditorConfig violations (#5816)
Signed-off-by: Michael Baumgartner <Michael-Baumgartner@posteo.de>
1 parent fe04dc8 commit c32e9b1

12 files changed

Lines changed: 31 additions & 19 deletions

File tree

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,15 @@ ij_kotlin_allow_trailing_comma_on_call_site = false
1818

1919
[*.kts]
2020
indent_style = tab
21+
22+
[*.xml.snapshot]
23+
# The expected XML files contain trailing spaces. Removing them let the tests fail.
24+
trim_trailing_whitespace = false
25+
26+
[.idea/*.xml]
27+
# Config files from IntelliJ are without a final newline.
28+
insert_final_newline = false
29+
30+
[documentation/modules/ROOT/images/extensions_StoreHierarchy.svg]
31+
# SVG files from draw.io are without a final newline
32+
insert_final_newline = false

.github/actions/run-gradle/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ runs:
3939
"-Dscan.value.GitHub job=${{ github.job }}" \
4040
javaToolchains \
4141
${{ inputs.arguments }} || error_code=$?
42-
43-
42+
43+
4444
if [ -n "${{ inputs.broken-by-issue }}" ]; then
4545
if [ -n "$error_code" ]; then
46-
# we expected the build to fail, it failed => pass
46+
# we expected the build to fail, it failed => pass
4747
exit 0
48-
else
48+
else
4949
# we expected the build to fail, it didn't => fail
5050
RED='\033[0;31m'
5151
RESET='\033[0m' # No Color
5252
echo "${RED}Build was expected to fail, but it passed. Was ${{ inputs.broken-by-issue }} resolved?${RESET}"
53-
exit 1
53+
exit 1
5454
fi
5555
fi
56-
56+
5757
# exit with the original error code if set
5858
if [ -n "$error_code" ]; then
5959
exit "$error_code"

.github/workflows/label-pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ jobs:
3333
}
3434
}
3535
`;
36-
36+
3737
const {repository} = await github.graphql(query, {
3838
owner: context.repo.owner,
3939
repo: context.repo.repo,
4040
pr: context.issue.number
4141
});
42-
42+
4343
let labels = Array.from(new Set(repository.pullRequest.closingIssuesReferences.nodes
4444
.flatMap((node) => node.labels.nodes.map((label) => label.name))))
4545
.filter((label) => !label.startsWith("status:") && label !== "up-for-grabs");
46-
46+
4747
if (labels.length > 0) {
4848
console.log(`Adding labels to PR: ${labels}`);
4949
await github.rest.issues.addLabels({

documentation/src/plantuml/junit-platform-suite-engine-diagram.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object "Tests in package B"
2121
"JUnit Platform" --> "Suite Test Engine": forwards request
2222

2323
"Suite Test Engine" --> "@Suite annotated class A"
24-
"@Suite annotated class A" --> "JUnit Platform (A)"
24+
"@Suite annotated class A" --> "JUnit Platform (A)"
2525
"JUnit Platform (A)" --> "Jupiter Test Engine (A)"
2626
"Jupiter Test Engine (A)" --> "Tests in package A"
2727

gradle/config/checkstyle/checkstyleMain.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<property name="severity" value="error" />
55

66
<module name="TreeWalker">
7-
<module name="SuppressWarningsHolder" />
7+
<module name="SuppressWarningsHolder" />
88
<module name="JavadocMethod">
99
<property name="allowMissingParamTags" value="true" />
1010
<property name="allowMissingReturnTag" value="true" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.junit.jupiter.engine.JupiterTestEngine
1+
org.junit.jupiter.engine.JupiterTestEngine
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.junit.vintage.engine.VintageTestEngine
1+
org.junit.vintage.engine.VintageTestEngine
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# more than 512 columns
2-
x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,
2+
x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,x,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ab , cd
2-
ef ,gh
2+
ef ,gh
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
I am used by tests, so...
22

3-
Do NOT delete me!
3+
Do NOT delete me!

0 commit comments

Comments
 (0)