diff --git a/Contributing.md b/Contributing.md index 23f529a5a3..474b5deb76 100644 --- a/Contributing.md +++ b/Contributing.md @@ -39,7 +39,7 @@ This guide is for developers who wish to contribute to the Dolphin codebase. It Following this guide and formatting your code as detailed will likely get your pull request merged much faster than if you don't (assuming the code itself has no mistakes). -This project uses clang-format 13.0 to check for common style issues. In case of conflicts between this guide and clang-format rules, the latter should be followed instead of this guide. +This project uses clang-format 19.1 to check for common style issues. In case of conflicts between this guide and clang-format rules, the latter should be followed instead of this guide. ## Checking and fixing formatting issues diff --git a/Source/.clang-format b/Source/.clang-format index 2262cdaa26..12912e9126 100644 --- a/Source/.clang-format +++ b/Source/.clang-format @@ -79,6 +79,8 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false Standard: Latest +StatementAttributeLikeMacros: + - emit TabWidth: 2 UseTab: Never --- @@ -93,4 +95,3 @@ ObjCSpaceBeforeProtocolList: true BraceWrapping: AfterObjCDeclaration: true ... - diff --git a/Tools/lint.sh b/Tools/lint.sh index db5398cc7c..69cb5b27bb 100755 --- a/Tools/lint.sh +++ b/Tools/lint.sh @@ -18,8 +18,8 @@ if ! [ -x "$(command -v $GIT)" ]; then exit 1 fi -REQUIRED_CLANG_FORMAT_MAJOR=13 -REQUIRED_CLANG_FORMAT_MINOR=0 +REQUIRED_CLANG_FORMAT_MAJOR=19 +REQUIRED_CLANG_FORMAT_MINOR=1 CLANG_FORMAT=clang-format CLANG_FORMAT_MAJOR=clang-format-${REQUIRED_CLANG_FORMAT_MAJOR} CLANG_FORMAT_MAJOR_MINOR=${CLANG_FORMAT_MAJOR}.${REQUIRED_CLANG_FORMAT_MINOR}