From 34c64a9cece26f491e92ddff576c259022af3a3b Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 12:45:50 -0500 Subject: [PATCH 1/7] Update clang format version --- .github/workflows/ci.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0401a3..1042b92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,19 @@ on: permissions: contents: read jobs: + check-formatting-all: + name: Check Formatting (All) + runs-on: ubuntu-latest + timeout-minutes: 5 + steps: + - name: Checkout + uses: actions/checkout@v6.0.2 + - name: Set up node + uses: actions/setup-node@v6.2.0 + with: + node-version: lts/* + - name: Check formatting + run: npx editorconfig-checker check-formatting-c: name: Check Formatting (C) runs-on: ubuntu-latest @@ -14,7 +27,7 @@ jobs: - name: Check formatting uses: jidicula/clang-format-action@v4.16.0 with: - clang-format-version: 18 + clang-format-version: 21 check-formatting-markdown: name: Check Formatting (Markdown) runs-on: ubuntu-latest From 7f9fb8eb4c90222ba3077049bd50aede44980d46 Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 12:54:32 -0500 Subject: [PATCH 2/7] Update .clang-format --- .clang-format | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 9d02d81..bf911b3 100644 --- a/.clang-format +++ b/.clang-format @@ -1,10 +1,11 @@ BasedOnStyle: Google Language: Cpp -AlignEscapedNewlinesLeft: false +AccessModifierOffset: -2 +AlignEscapedNewlines: Left AllowShortBlocksOnASingleLine: Never AllowShortCaseLabelsOnASingleLine: false AllowShortEnumsOnASingleLine: true -AllowShortFunctionsOnASingleLine: None +AllowShortFunctionsOnASingleLine: Empty AllowShortIfStatementsOnASingleLine: Never AllowShortLambdasOnASingleLine: Empty AllowShortLoopsOnASingleLine: false From 4bf475f1301a2fa73202a208e5f5263477066499 Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 12:58:55 -0500 Subject: [PATCH 3/7] Update --- .clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index bf911b3..d965f2a 100644 --- a/.clang-format +++ b/.clang-format @@ -1,7 +1,7 @@ BasedOnStyle: Google Language: Cpp AccessModifierOffset: -2 -AlignEscapedNewlines: Left +AlignEscapedNewlines: Right AllowShortBlocksOnASingleLine: Never AllowShortCaseLabelsOnASingleLine: false AllowShortEnumsOnASingleLine: true From b3961dbec73f0456ade488a50306a10eaf51ef8a Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 13:02:34 -0500 Subject: [PATCH 4/7] Update `.editorconfig` --- .editorconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.editorconfig b/.editorconfig index d92fd87..c1ceeb4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,3 +7,8 @@ trim_trailing_whitespace = true insert_final_newline = true indent_style = space indent_size = 2 + +# mostly handled by clang-format +[*.{h,c}] +indent_style = space +indent_size = 1 From f7613990502ec4f290c06c16d568745fe5757b14 Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 13:14:50 -0500 Subject: [PATCH 5/7] Fix formatting --- .gitmodules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3aebbca..190aad7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "sgdk"] - path = externals/sgdk - url = https://github.com/Stephane-D/SGDK.git - branch = master - ignore = dirty - shallow = true + path = externals/sgdk + url = https://github.com/Stephane-D/SGDK.git + branch = master + ignore = dirty + shallow = true [submodule "sgcc"] - path = externals/sgcc - url = https://github.com/devpow112/sgcc.git - branch = main - ignore = dirty - shallow = true + path = externals/sgcc + url = https://github.com/devpow112/sgcc.git + branch = main + ignore = dirty + shallow = true From 62024091ad74f5d2bbed560c3910ab30b41cf432 Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 13:19:24 -0500 Subject: [PATCH 6/7] Ignore --- .editorconfig | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index c1ceeb4..0a70ec2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,20 @@ insert_final_newline = true indent_style = space indent_size = 2 -# mostly handled by clang-format +# handled by clang-format [*.{h,c}] -indent_style = space -indent_size = 1 +charset = unset +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +indent_style = unset +indent_size = unset + +# image format +[*.{ase}] +charset = unset +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +indent_style = unset +indent_size = unset From 59b6cda1f662e3a88d69b4ddca1f81f4ed47c34c Mon Sep 17 00:00:00 2001 From: Devon Powell Date: Sun, 25 Jan 2026 13:20:51 -0500 Subject: [PATCH 7/7] Ignore --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 0a70ec2..bc97b29 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,7 +18,7 @@ indent_style = unset indent_size = unset # image format -[*.{ase}] +[*.ase] charset = unset end_of_line = unset insert_final_newline = unset