[clang-format] Add `SpaceInComments` option to control spacing around `/* */` #162105

Men-cotton · 2025-10-06T15:30:36Z

Summary

Add a clang-format SpaceInComments option to control spaces right after /* and right before */ in block comments.
Provide three values
- Always (force a single space)
- Never (remove the space)
- Leave (default; keep existing formatting).
The option has four per-position settings inside SpaceInComments. Each setting accepts Always, Never, or Leave.
- AfterOpeningComment and BeforeClosingComment for regular block comments.
- AfterOpeningParamComment and BeforeClosingParamComment for inline parameter comments such as /*param=*/.
Documentation-style comments that start with /*! or /** are intentionally left unchanged.

Behavior

Always

/* foo */ /* foo bar */ /* foo  */ /*  foo */

Never

/*foo*/ /*foo bar*/ /*foo */ /* foo*/

Leave (default)
Keeps whatever spacing is already present in the comment.

Closes #160682

github-actions · 2025-10-06T15:30:57Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2025-10-06T15:31:35Z

@llvm/pr-subscribers-clang

Author: Men-cotton (Men-cotton)

Changes

#160682

Full diff: https://github.com/llvm/llvm-project/pull/162105.diff

6 Files Affected:

(modified) clang/docs/ClangFormatStyleOptions.rst (+11)
(modified) clang/include/clang/Format/Format.h (+10)
(modified) clang/lib/Format/Format.cpp (+3)
(modified) clang/lib/Format/FormatTokenLexer.cpp (+19)
(modified) clang/lib/Format/FormatTokenLexer.h (+3)
(modified) clang/unittests/Format/FormatTestComments.cpp (+11)

diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index b746df5dab264..70582b6c40980 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -6343,6 +6343,17 @@ the configuration (without a prefix: ``Auto``). case 1 : break; case 1: break; } } +.. _SpaceBeforeClosingBlockComment: + +**SpaceBeforeClosingBlockComment** (``Boolean``) :versionbadge:`clang-format 21` :ref:`¶ <SpaceBeforeClosingBlockComment>` + If ``true``, a space is inserted immediately before the closing ``*/`` in + block comments that contain content. + + .. code-block:: c++ + + true: false: + /* comment */ vs. /* comment*/ + .. _SpaceBeforeCpp11BracedList: **SpaceBeforeCpp11BracedList** (``Boolean``) :versionbadge:`clang-format 7` :ref:`¶ <SpaceBeforeCpp11BracedList>` diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 3df5b92654094..7136fd2c5a4f8 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -4684,6 +4684,15 @@ struct FormatStyle { /// \version 17 bool SpaceBeforeJsonColon; + /// If ``true``, a space is inserted immediately before the closing ``*/`` in + /// block comments that contain content. + /// \code + /// true: false: + /// /* comment */ vs. /* comment*/ + /// \endcode + /// \version 21 + bool SpaceBeforeClosingBlockComment; + /// Different ways to put a space before opening parentheses. enum SpaceBeforeParensStyle : int8_t { /// This is **deprecated** and replaced by ``Custom`` below, with all @@ -5611,6 +5620,7 @@ struct FormatStyle { SpaceAroundPointerQualifiers == R.SpaceAroundPointerQualifiers && SpaceBeforeRangeBasedForLoopColon == R.SpaceBeforeRangeBasedForLoopColon && + SpaceBeforeClosingBlockComment == R.SpaceBeforeClosingBlockComment && SpaceBeforeSquareBrackets == R.SpaceBeforeSquareBrackets && SpaceInEmptyBraces == R.SpaceInEmptyBraces && SpacesBeforeTrailingComments == R.SpacesBeforeTrailingComments && diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 686e54128d372..06292c75f27e0 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -1222,6 +1222,8 @@ template <> struct MappingTraits<FormatStyle> { IO.mapOptional("SpaceBeforeInheritanceColon", Style.SpaceBeforeInheritanceColon); IO.mapOptional("SpaceBeforeJsonColon", Style.SpaceBeforeJsonColon); + IO.mapOptional("SpaceBeforeClosingBlockComment", + Style.SpaceBeforeClosingBlockComment); IO.mapOptional("SpaceBeforeParens", Style.SpaceBeforeParens); IO.mapOptional("SpaceBeforeParensOptions", Style.SpaceBeforeParensOptions); IO.mapOptional("SpaceBeforeRangeBasedForLoopColon", @@ -1717,6 +1719,7 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) { LLVMStyle.SpaceBeforeCtorInitializerColon = true; LLVMStyle.SpaceBeforeInheritanceColon = true; LLVMStyle.SpaceBeforeJsonColon = false; + LLVMStyle.SpaceBeforeClosingBlockComment = false; LLVMStyle.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements; LLVMStyle.SpaceBeforeParensOptions = {}; LLVMStyle.SpaceBeforeParensOptions.AfterControlStatements = true; diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp index 86a5185a92a52..b48d1b7a82026 100644 --- a/clang/lib/Format/FormatTokenLexer.cpp +++ b/clang/lib/Format/FormatTokenLexer.cpp @@ -18,8 +18,11 @@ #include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceManager.h" #include "clang/Format/Format.h" +#include "llvm/ADT/SmallString.h" #include "llvm/Support/Regex.h" +#include <algorithm> + namespace clang { namespace format { @@ -1386,6 +1389,22 @@ FormatToken *FormatTokenLexer::getNextToken() { StringRef UntrimmedText = FormatTok->TokenText; FormatTok->TokenText = FormatTok->TokenText.rtrim(" \t\v\f"); TrailingWhitespace = UntrimmedText.size() - FormatTok->TokenText.size(); + if (Style.SpaceBeforeClosingBlockComment && + FormatTok->TokenText.starts_with("/*") && + FormatTok->TokenText.ends_with("*/")) { + StringRef Body = FormatTok->TokenText.drop_front(2).drop_back(2); + if (!Body.empty()) { + const char BeforeClosing = Body.back(); + if (!isWhitespace(static_cast<unsigned char>(BeforeClosing))) { + llvm::SmallString<64> Adjusted(FormatTok->TokenText); + Adjusted.insert(Adjusted.end() - 2, ' '); + char *Storage = CommentTextAllocator.Allocate<char>(Adjusted.size()); + std::copy(Adjusted.begin(), Adjusted.end(), Storage); + FormatTok->TokenText = StringRef(Storage, Adjusted.size()); + FormatTok->Tok.setLength(FormatTok->TokenText.size()); + } + } + } } else if (FormatTok->is(tok::raw_identifier)) { IdentifierInfo &Info = IdentTable.get(FormatTok->TokenText); FormatTok->Tok.setIdentifierInfo(&Info); diff --git a/clang/lib/Format/FormatTokenLexer.h b/clang/lib/Format/FormatTokenLexer.h index 57c572af3defd..65b1199c1501c 100644 --- a/clang/lib/Format/FormatTokenLexer.h +++ b/clang/lib/Format/FormatTokenLexer.h @@ -20,6 +20,7 @@ #include "llvm/ADT/MapVector.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringSet.h" +#include "llvm/Support/Allocator.h" #include <stack> @@ -130,6 +131,8 @@ class FormatTokenLexer { unsigned FirstInLineIndex; SmallVector<FormatToken *, 16> Tokens; + llvm::BumpPtrAllocator CommentTextAllocator; + llvm::SmallMapVector<IdentifierInfo *, TokenType, 8> Macros; llvm::SmallPtrSet<IdentifierInfo *, 8> MacrosSkippedByRemoveParentheses, diff --git a/clang/unittests/Format/FormatTestComments.cpp b/clang/unittests/Format/FormatTestComments.cpp index 69026bce98705..e12e17c0e12a8 100644 --- a/clang/unittests/Format/FormatTestComments.cpp +++ b/clang/unittests/Format/FormatTestComments.cpp @@ -332,6 +332,17 @@ TEST_F(FormatTestComments, UnderstandsSingleLineComments) { verifyNoCrash(StringRef("/*\\\0\n/", 6)); } +TEST_F(FormatTestComments, InsertsSpaceBeforeClosingBlockComment) { + FormatStyle Style = getLLVMStyle(); + Style.SpaceBeforeClosingBlockComment = true; + + verifyFormat("foo(/* comment */);", "foo(/* comment*/);", Style); + verifyFormat("foo(/*Logger= */nullptr);", "foo(/*Logger=*/nullptr);", Style); + verifyFormat("/* comment */", Style); + verifyFormat("/* leading */\nint x;", Style); + verifyFormat("/* multiline\n */", Style); +} + TEST_F(FormatTestComments, KeepsParameterWithTrailingCommentsOnTheirOwnLine) { EXPECT_EQ("SomeFunction(a,\n" " b, // comment\n"

llvmbot · 2025-10-06T15:31:35Z

@llvm/pr-subscribers-clang-format

Author: Men-cotton (Men-cotton)

Changes

#160682

Full diff: https://github.com/llvm/llvm-project/pull/162105.diff

6 Files Affected:

(modified) clang/docs/ClangFormatStyleOptions.rst (+11)
(modified) clang/include/clang/Format/Format.h (+10)
(modified) clang/lib/Format/Format.cpp (+3)
(modified) clang/lib/Format/FormatTokenLexer.cpp (+19)
(modified) clang/lib/Format/FormatTokenLexer.h (+3)
(modified) clang/unittests/Format/FormatTestComments.cpp (+11)

diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index b746df5dab264..70582b6c40980 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -6343,6 +6343,17 @@ the configuration (without a prefix: ``Auto``). case 1 : break; case 1: break; } } +.. _SpaceBeforeClosingBlockComment: + +**SpaceBeforeClosingBlockComment** (``Boolean``) :versionbadge:`clang-format 21` :ref:`¶ <SpaceBeforeClosingBlockComment>` + If ``true``, a space is inserted immediately before the closing ``*/`` in + block comments that contain content. + + .. code-block:: c++ + + true: false: + /* comment */ vs. /* comment*/ + .. _SpaceBeforeCpp11BracedList: **SpaceBeforeCpp11BracedList** (``Boolean``) :versionbadge:`clang-format 7` :ref:`¶ <SpaceBeforeCpp11BracedList>` diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 3df5b92654094..7136fd2c5a4f8 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -4684,6 +4684,15 @@ struct FormatStyle { /// \version 17 bool SpaceBeforeJsonColon; + /// If ``true``, a space is inserted immediately before the closing ``*/`` in + /// block comments that contain content. + /// \code + /// true: false: + /// /* comment */ vs. /* comment*/ + /// \endcode + /// \version 21 + bool SpaceBeforeClosingBlockComment; + /// Different ways to put a space before opening parentheses. enum SpaceBeforeParensStyle : int8_t { /// This is **deprecated** and replaced by ``Custom`` below, with all @@ -5611,6 +5620,7 @@ struct FormatStyle { SpaceAroundPointerQualifiers == R.SpaceAroundPointerQualifiers && SpaceBeforeRangeBasedForLoopColon == R.SpaceBeforeRangeBasedForLoopColon && + SpaceBeforeClosingBlockComment == R.SpaceBeforeClosingBlockComment && SpaceBeforeSquareBrackets == R.SpaceBeforeSquareBrackets && SpaceInEmptyBraces == R.SpaceInEmptyBraces && SpacesBeforeTrailingComments == R.SpacesBeforeTrailingComments && diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 686e54128d372..06292c75f27e0 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -1222,6 +1222,8 @@ template <> struct MappingTraits<FormatStyle> { IO.mapOptional("SpaceBeforeInheritanceColon", Style.SpaceBeforeInheritanceColon); IO.mapOptional("SpaceBeforeJsonColon", Style.SpaceBeforeJsonColon); + IO.mapOptional("SpaceBeforeClosingBlockComment", + Style.SpaceBeforeClosingBlockComment); IO.mapOptional("SpaceBeforeParens", Style.SpaceBeforeParens); IO.mapOptional("SpaceBeforeParensOptions", Style.SpaceBeforeParensOptions); IO.mapOptional("SpaceBeforeRangeBasedForLoopColon", @@ -1717,6 +1719,7 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) { LLVMStyle.SpaceBeforeCtorInitializerColon = true; LLVMStyle.SpaceBeforeInheritanceColon = true; LLVMStyle.SpaceBeforeJsonColon = false; + LLVMStyle.SpaceBeforeClosingBlockComment = false; LLVMStyle.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements; LLVMStyle.SpaceBeforeParensOptions = {}; LLVMStyle.SpaceBeforeParensOptions.AfterControlStatements = true; diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp index 86a5185a92a52..b48d1b7a82026 100644 --- a/clang/lib/Format/FormatTokenLexer.cpp +++ b/clang/lib/Format/FormatTokenLexer.cpp @@ -18,8 +18,11 @@ #include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceManager.h" #include "clang/Format/Format.h" +#include "llvm/ADT/SmallString.h" #include "llvm/Support/Regex.h" +#include <algorithm> + namespace clang { namespace format { @@ -1386,6 +1389,22 @@ FormatToken *FormatTokenLexer::getNextToken() { StringRef UntrimmedText = FormatTok->TokenText; FormatTok->TokenText = FormatTok->TokenText.rtrim(" \t\v\f"); TrailingWhitespace = UntrimmedText.size() - FormatTok->TokenText.size(); + if (Style.SpaceBeforeClosingBlockComment && + FormatTok->TokenText.starts_with("/*") && + FormatTok->TokenText.ends_with("*/")) { + StringRef Body = FormatTok->TokenText.drop_front(2).drop_back(2); + if (!Body.empty()) { + const char BeforeClosing = Body.back(); + if (!isWhitespace(static_cast<unsigned char>(BeforeClosing))) { + llvm::SmallString<64> Adjusted(FormatTok->TokenText); + Adjusted.insert(Adjusted.end() - 2, ' '); + char *Storage = CommentTextAllocator.Allocate<char>(Adjusted.size()); + std::copy(Adjusted.begin(), Adjusted.end(), Storage); + FormatTok->TokenText = StringRef(Storage, Adjusted.size()); + FormatTok->Tok.setLength(FormatTok->TokenText.size()); + } + } + } } else if (FormatTok->is(tok::raw_identifier)) { IdentifierInfo &Info = IdentTable.get(FormatTok->TokenText); FormatTok->Tok.setIdentifierInfo(&Info); diff --git a/clang/lib/Format/FormatTokenLexer.h b/clang/lib/Format/FormatTokenLexer.h index 57c572af3defd..65b1199c1501c 100644 --- a/clang/lib/Format/FormatTokenLexer.h +++ b/clang/lib/Format/FormatTokenLexer.h @@ -20,6 +20,7 @@ #include "llvm/ADT/MapVector.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringSet.h" +#include "llvm/Support/Allocator.h" #include <stack> @@ -130,6 +131,8 @@ class FormatTokenLexer { unsigned FirstInLineIndex; SmallVector<FormatToken *, 16> Tokens; + llvm::BumpPtrAllocator CommentTextAllocator; + llvm::SmallMapVector<IdentifierInfo *, TokenType, 8> Macros; llvm::SmallPtrSet<IdentifierInfo *, 8> MacrosSkippedByRemoveParentheses, diff --git a/clang/unittests/Format/FormatTestComments.cpp b/clang/unittests/Format/FormatTestComments.cpp index 69026bce98705..e12e17c0e12a8 100644 --- a/clang/unittests/Format/FormatTestComments.cpp +++ b/clang/unittests/Format/FormatTestComments.cpp @@ -332,6 +332,17 @@ TEST_F(FormatTestComments, UnderstandsSingleLineComments) { verifyNoCrash(StringRef("/*\\\0\n/", 6)); } +TEST_F(FormatTestComments, InsertsSpaceBeforeClosingBlockComment) { + FormatStyle Style = getLLVMStyle(); + Style.SpaceBeforeClosingBlockComment = true; + + verifyFormat("foo(/* comment */);", "foo(/* comment*/);", Style); + verifyFormat("foo(/*Logger= */nullptr);", "foo(/*Logger=*/nullptr);", Style); + verifyFormat("/* comment */", Style); + verifyFormat("/* leading */\nint x;", Style); + verifyFormat("/* multiline\n */", Style); +} + TEST_F(FormatTestComments, KeepsParameterWithTrailingCommentsOnTheirOwnLine) { EXPECT_EQ("SomeFunction(a,\n" " b, // comment\n"

mydeveloperday · 2025-10-08T17:28:44Z

clang/include/clang/Format/Format.h

+ /// block comments that contain content.
+ /// \code
+ /// true: false:
+ /// /* comment */ vs. /* comment*/


I think we want options to handle this differently.

foo(/*bar=*/true);

Needs to have at least Space, NoSpace, Leave because the default of false is going to now remove spaces everywhere

All options normally go through a phase boolean -> enum -> struct I think in this case we should short circuit straight to struct

struct SpaceInComments
{
AfterOpeningComment = Leave
BeforeClosingComment = Leave
AfterOpeningParamComment = Leave
BeforeCloseingParamComment = No // I think this is the current behavior
}

I’ve wired up SpaceInComments per your struct.

At the moment, AfterOpeningParamComment defaults to Leave, which means parameter comments fall back to whatever AfterOpeningComment specifies—e.g., if the general option is Always, we still insert the leading space in /*param=*/, and if it’s Never, we remove it. Setting AfterOpeningParamComment to Always or Never overrides that fallback.

Is that the interaction you were expecting, or should Leave on the parameter knob preserve the existing spacing even when the general control is driving changes?

clang/include/clang/Format/Format.h

clang/unittests/Format/FormatTestComments.cpp

clang/docs/ClangFormatStyleOptions.rst

clang/include/clang/Format/Format.h

clang/lib/Format/FormatToken.h

clang/unittests/Format/FormatTestComments.cpp

clang/lib/Format/FormatToken.h

clang/lib/Format/BreakableToken.cpp

…ers (llvm#162105)

HazardyKnusperkeks

For further review it would be nice if you neither amend or rebase. Otherwise there is no method of viewing the diff of your new changes.

clang/include/clang/Format/Format.h

clang/lib/Format/FormatToken.h

clang/unittests/Format/FormatTestComments.cpp

clang/lib/Format/WhitespaceManager.cpp

clang/lib/Format/TokenAnnotator.cpp

clang/lib/Format/FormatTokenLexer.cpp

HazardyKnusperkeks · 2025-10-28T21:58:33Z

clang/lib/Format/BreakableToken.cpp

+ FormatStyle::CommentSpaceMode ParamOverrideMode,
+ const bool ForceDocstringLeave) {
+ if (Tok.getBlockCommentKind() == CommentKind::Parameter) {
+ if (ParamOverrideMode != FormatStyle::CommentSpaceMode::Leave)


#162105 (comment)

Don't make the parameter option to use the other one, if set to Leave.

HazardyKnusperkeks

@owenca can you also take a look?

clang/lib/Format/BreakableToken.cpp

clang/lib/Format/FormatToken.h

owenca · 2025-11-24T07:26:51Z

@Men-cotton please describe in the commit message what this new option is intended to solve. Not just an issue number.

@owenca can you also take a look?

What I would do is to add a single SpacesInBlockComment option with the following values:

Always

/* foo */ /* foo bar */ /* foo */ /* foo */

Never

/*foo*/ /*foo bar*/ /*foo */ /* foo*/

Leave

Comments ending in =*/ (and also starting in /** or ending in **/?) should not be affected by this option.

…ify whitespace adjustment logic

owenca · 2025-11-27T07:06:47Z

Add a clang-format SpaceInComments option to control spaces right after /* and right before */ in block comments.

We should name the option SpacesInComments, similar to SpacesInAngles and other SpacesIn... options.

The option has four per-position settings inside SpaceInComments. Each setting accepts Always, Never, or Leave.

AfterOpeningComment and BeforeClosingComment for regular block comments.

AfterOpeningParamComment and BeforeClosingParamComment for inline parameter comments such as /*param=*/.

When I suggested "to add a single SpacesInBlockComment option", I didn't mean to add it on top of those suboptions. Instead, SpacesInBlockComment should function like SpacesInAngles for example.

Men-cotton · 2025-11-29T13:01:38Z

@owenca
Thanks for the clarification.

To provide a bit of context on how this evolved into a struct: I initially split out inline parameter comments from regular block comments based on earlier feedback from @mydeveloperday.
The concern was that a single global Always setting would negatively impact parameter hints, turning foo(/*bar=*/true) into foo(/* bar= */true).

I’m planning to rework the patch to follow your proposal and expose a single SpacesInComments enum, similar to SpacesInAngles.

For the actual behavior, my current thought is to apply this option only to “ordinary” block comments and to treat /*param=*/-style parameter comments and documentation comments (/** ... */, /*! ... */, etc.) as out of scope, so they remain unchanged regardless of the setting. Does that match what you had in mind, or would you prefer a different treatment for /*param=*/ comments in particular?

owenca · 2025-11-30T08:14:30Z

For the actual behavior, my current thought is to apply this option only to “ordinary” block comments and to treat /*param=*/-style parameter comments and documentation comments (/** ... */, /*! ... */, etc.) as out of scope, so they remain unchanged regardless of the setting.

Yes, that's what I had in mind, as mentioned at the end of my comment above. In fact, this option should only affect real block comments. For example, embedded ~~and trailing~~ comments should be excluded.

llvmbot added clang Clang issues not falling into any other category clang-format labels Oct 6, 2025

Men-cotton changed the title ~~[clang-format] Option to insert spaces before the closing */~~ [clang-format] Option to insert spaces before the closing */ Oct 6, 2025

Men-cotton marked this pull request as draft October 6, 2025 16:24

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch 2 times, most recently from 9f59655 to ed55a3b Compare October 8, 2025 02:31

Men-cotton marked this pull request as ready for review October 8, 2025 02:32

Men-cotton marked this pull request as draft October 8, 2025 03:22

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch from 9b0b3cf to 975bc0b Compare October 8, 2025 06:43

Men-cotton marked this pull request as ready for review October 8, 2025 06:45

Men-cotton mentioned this pull request Oct 8, 2025

[clang-format] Option to insert spaces before the closing */ #160682

Open

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch from fe5908b to 3cfb708 Compare October 8, 2025 15:50

mydeveloperday reviewed Oct 8, 2025

View reviewed changes

clang/include/clang/Format/Format.h Outdated Show resolved Hide resolved

mydeveloperday reviewed Oct 8, 2025

View reviewed changes

clang/unittests/Format/FormatTestComments.cpp Outdated Show resolved Hide resolved

mydeveloperday reviewed Oct 8, 2025

View reviewed changes

clang/unittests/Format/FormatTestComments.cpp Outdated Show resolved Hide resolved

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch from af00c19 to d947839 Compare October 25, 2025 05:35

HazardyKnusperkeks reviewed Oct 25, 2025

View reviewed changes

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch 2 times, most recently from ecebae0 to 1cf571b Compare October 28, 2025 03:18

Men-cotton added a commit to Men-cotton/llvm-project that referenced this pull request Oct 28, 2025

[clang-format] Add SpaceInComments controls for block comment delimit…

7de5905

…ers (llvm#162105)

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch from 1cf571b to 7de5905 Compare October 28, 2025 06:25

[clang-format] Add SpaceInComments controls for block comment delimit…

7a29a63

…ers (llvm#162105)

Men-cotton force-pushed the users/Men-cotton/clang-format/space-before-closing-comment branch from 7de5905 to 7a29a63 Compare October 28, 2025 06:32

HazardyKnusperkeks reviewed Oct 28, 2025

View reviewed changes

HazardyKnusperkeks requested review from owenca and sstwcw October 28, 2025 22:02

HazardyKnusperkeks removed request for DeinAlptraum, Endilll, QuietMisdreavus, aaupov, andykaylor, ayermolo, bcardosolopes, cyndyishida, daniel-grumberg, lanza, maksfb, paschalis-mpeis, rafaelauler, xlauko, yota9 and yozhu November 23, 2025 10:10

HazardyKnusperkeks reviewed Nov 23, 2025

View reviewed changes

clang/lib/Format/BreakableToken.cpp Outdated Show resolved Hide resolved

clang/lib/Format/BreakableToken.cpp Outdated Show resolved Hide resolved

clang/lib/Format/FormatToken.h Outdated Show resolved Hide resolved

Men-cotton added 5 commits November 23, 2025 23:19

Fix: remove unnecessary assert

38dea1c

Fix: minor refactoring

c3d7598

Fix: skip block comment spacing when set to Leave

8fcc006

Fix: honor space-in-comments when reflowing block comments

124584f

Fix: rename to maintain consistency of variable names

51d35ed

Men-cotton changed the title ~~[clang-format] Option to insert spaces before the closing */~~ [clang-format] Add SpaceInComments option to control spacing around /* */ Nov 24, 2025

Men-cotton added 2 commits November 25, 2025 01:04

Fix: account boundary spacing when reflowing block comments and simpl…

5ca76e2

…ify whitespace adjustment logic

Fix: make block comment spacing tab-aware

d9c0f92

Fix: rename to SpacesInComments and sort by alphabetical ordering

61ca3ea

[clang-format] Add SpaceInComments option to control spacing around /* */ #162105

Are you sure you want to change the base?

[clang-format] Add SpaceInComments option to control spacing around /* */ #162105

Uh oh!

Conversation

Men-cotton commented Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Behavior

github-actions bot commented Oct 6, 2025

llvmbot commented Oct 6, 2025

llvmbot commented Oct 6, 2025

mydeveloperday Oct 8, 2025

Choose a reason for hiding this comment

mydeveloperday Oct 8, 2025

Choose a reason for hiding this comment

mydeveloperday Oct 8, 2025

Choose a reason for hiding this comment

Men-cotton Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HazardyKnusperkeks left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HazardyKnusperkeks Oct 28, 2025

Choose a reason for hiding this comment

Men-cotton Oct 29, 2025

Choose a reason for hiding this comment

HazardyKnusperkeks Nov 5, 2025

Choose a reason for hiding this comment

HazardyKnusperkeks left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

owenca commented Nov 24, 2025

owenca commented Nov 27, 2025

Men-cotton commented Nov 29, 2025

owenca commented Nov 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Labels

5 participants

[clang-format] Add `SpaceInComments` option to control spacing around `/* */` #162105

[clang-format] Add `SpaceInComments` option to control spacing around `/* */` #162105

Men-cotton commented Oct 6, 2025 •

edited

Loading

Men-cotton Oct 27, 2025 •

edited

Loading

owenca commented Nov 30, 2025 •

edited

Loading