clang-format: indent preprocessor directives after hash · gitgitgadget/git@e3ea432 · GitHub

gitgitgadget / git Public

forked from git/git

• Notifications You must be signed in to change notification settings
• Fork 196
• Star 305

• Code
• Issues 76
• Pull requests 226
• Actions
• Security and quality
• Insights

Additional navigation options

Commit e3ea432

Browse filesBrowse the repository at this point in the historyBrowse files

KarthikNayak

authored and

gitster

committed

clang-format: indent preprocessor directives after hash

We do not have a rule around the indentation of preprocessor directives. This was also discussed on the list [1], noting how there is often inconsistency in the styling. While there was discussion, there was no conclusion around what is the preferred style here. One style being indenting after the hash: #if FOO # if BAR # include <foo> # endif #endif The other being before the hash: #if FOO #if BAR #include <foo> #endif #endif Let's pick the former and add 'IndentPPDirectives: AfterHash' value to our '.clang-format'. There is no clear reason to pick one over the other, but it would definitely be nicer to be consistent. [1]: https://lore.kernel.org/r/xmqqwmmm1bw6.fsf@gitster.g Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 parent 557ae14 commit e3ea432
Copy full SHA for e3ea432

1 file changed

+6Lines changed: 6 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .clang-format

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.clang-format‎

Copy file name to clipboardExpand all lines: .clang-format

+6Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -96,6 +96,12 @@ BreakStringLiterals: false
96	96	# Switch statement body is always indented one level more than case labels.
97	97	IndentCaseLabels: false
98	98
	99	+ # Indents directives before the hash.
	100	+ # #if FOO
	101	+ # # include <foo>
	102	+ # #endif
	103	+ IndentPPDirectives: AfterHash
	104	+
99	105	# Don't indent a function definition or declaration if it is wrapped after the
100	106	# type
101	107	IndentWrappedFunctionNames: false

0 commit comments

Comments

0 (0)