Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.clang-format: Change AllowShortFunctionsOnASingleLine back to Inline #100830

Merged
merged 1 commit into from
Dec 29, 2024

Conversation

nikitalita
Copy link
Contributor

Reverts the workaround introduced in #63868

Due to a bug in clang-format-14, we had to change AllowShortFunctionsOnASingleLine to All as a workaround. Now that we're up to clang-format-17, this can be changed back without issue.

Copy link
Contributor

@Repiteo Repiteo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Just be sure to add the same setting to .clang-format-glsl:

 misc/utility/.clang-format-glsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/utility/.clang-format-glsl b/misc/utility/.clang-format-glsl
index 59efa8fa35..dedd83b1de 100644
--- a/misc/utility/.clang-format-glsl
+++ b/misc/utility/.clang-format-glsl
@@ -8,6 +8,7 @@ AlignTrailingComments:
   Kind: Never
   OverEmptyLines: 0
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: Inline
 BreakConstructorInitializers: AfterColon
 ColumnLimit: 0
 ConstructorInitializerIndentWidth: 8

@nikitalita
Copy link
Contributor Author

Done

@akien-mga akien-mga changed the title .clang-format: change AllowShortFunctionsOnASingleLine back to Inline .clang-format: Change AllowShortFunctionsOnASingleLine back to Inline Dec 26, 2024
@Repiteo Repiteo merged commit f42e40b into godotengine:master Dec 29, 2024
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Dec 29, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants