[clang-format][docs] Fix incorrect 'clang-format 13' configuration options markers

[kuzkry]

Summary

Note: Option 'IndentRequiresClause' was previously known as
'IndentRequires' but the version marker should still indicate
'clang-format 15' as this option most recent name wasn't accessible
earlier and it would produce:
error: unknown key 'IndentRequiresClause'

[MyDeveloperDay]

@HazardyKnusperkeks could you validate the IndentRequiresClause I know I added IndentRequires in 13 but is this the same option renamed or a new option?

[MyDeveloperDay]

I understand what you are saying re 'IndentRequiresClause' but this leaves us with people with "IndentRequires" in their .clang-format without any understanding of what it means? i.e. what about the 14.0 people? if we've renamed an option then the documentation should carry something like

'Previously known as IndentRequires'

[HazardyKnusperkeks]

In D119682#3321975, @MyDeveloperDay wrote:

I understand what you are saying re 'IndentRequiresClause' but this leaves us with people with "IndentRequires" in their .clang-format without any understanding of what it means? i.e. what about the 14.0 people? if we've renamed an option then the documentation should carry something like

'Previously known as IndentRequires'

That's not the first time we renamed something. And most likely not the last time.

clang/include/clang/Format/Format.h

2542–2543

[kuzkry]

First of all, thanks @MyDeveloperDay for the approval.

In D119682#3321965, @MyDeveloperDay wrote:

@HazardyKnusperkeks could you validate the IndentRequiresClause I know I added IndentRequires in 13 but is this the same option renamed or a new option?

This was renamed and it was done in 9aab0db13fb6d21d1b70247a9b5e4cf916ee1c3a.

In D119682#3321975, @MyDeveloperDay wrote:

I understand what you are saying re 'IndentRequiresClause' but this leaves us with people with "IndentRequires" in their .clang-format without any understanding of what it means? i.e. what about the 14.0 people? if we've renamed an option then the documentation should carry something like

'Previously known as IndentRequires'

I have no problems with adding it myself if you want. I think this is nice to have and I see nothing wrong in adding it.

In D119682#3322082, @HazardyKnusperkeks wrote:

In D119682#3321975, @MyDeveloperDay wrote:

I understand what you are saying re 'IndentRequiresClause' but this leaves us with people with "IndentRequires" in their .clang-format without any understanding of what it means? i.e. what about the 14.0 people? if we've renamed an option then the documentation should carry something like

'Previously known as IndentRequires'

That's not the first time we renamed something. And most likely not the last time.

But that doesn't mean we can't add "Previously known as IndentRequires", does it? :)

To all:
I'm willing to add "Previously known as IndentRequires" but please let me know if you're for or against it.

[MyDeveloperDay]

clang/include/clang/Format/Format.h

2542–2543

I like that suggestion..

[MyDeveloperDay]

I like /// In clang-format 13 and 14 it was named IndentRequires. The code in theory should still support it so it should be documented.

[kuzkry]

Review fix: added note about IndentRequires. The generated HTML looks like this:

[kuzkry]

clang/include/clang/Format/Format.h

2542–2543

Sorry, I didn't notice this inline comment before.

@HazardyKnusperkeks, I put it in a slightly different place, i.e. above the example code as Sphinx complained about this particular placement.

[HazardyKnusperkeks]

That's not the first time we renamed something. And most likely not the last time.

But that doesn't mean we can't add "Previously known as IndentRequires", does it? :)

Of course! I just wanted to say that we can and should create precedence here.

clang/include/clang/Format/Format.h

2542–2543

Fine by me. I have absolutely no idea about this sphinx or .rst stuff.

[kuzkry]

Can I ask you to deliver this one for me? My name and email in git format is "Krystian Kuzniarek <[e-mail]>"

clang/docs/ClangFormatStyleOptions.rst

.. code-block:: c++
       void bar() { foo(true); }
       } // namespace N
 
   * ``BS_Custom`` (in configuration: ``Custom``)
     Configure each individual brace in `BraceWrapping`.
 
 
 
-**BreakBeforeConceptDeclarations** (``BreakBeforeConceptDeclarationsStyle``) :versionbadge:`clang-format 13`
+**BreakBeforeConceptDeclarations** (``BreakBeforeConceptDeclarationsStyle``) :versionbadge:`clang-format 12`
   The concept declaration style to use.
 
   Possible values:
 
   * ``BBCDS_Never`` (in configuration: ``Never``)
     Keep the template declaration line together with ``concept``.
 
     .. code-block:: c++
.. code-block:: c++
       private:
 
       protected:
 
       };
 
 
 
-**EmptyLineBeforeAccessModifier** (``EmptyLineBeforeAccessModifierStyle``) :versionbadge:`clang-format 13`
+**EmptyLineBeforeAccessModifier** (``EmptyLineBeforeAccessModifierStyle``) :versionbadge:`clang-format 12`
   Defines in which cases to put empty line before access modifiers.
 
   Possible values:
 
   * ``ELBAMS_Never`` (in configuration: ``Never``)
     Remove all empty lines before access modifiers.
 
     .. code-block:: c++
.. code-block:: c++
        #if FOO
          #if BAR
            #include <foo>
          #endif
        #endif
 
 
 
-**IndentRequiresClause** (``Boolean``) :versionbadge:`clang-format 13`
+**IndentRequiresClause** (``Boolean``) :versionbadge:`clang-format 15`
   Indent the requires clause in a template. This only applies when
   ``RequiresClausePosition`` is ``OwnLine``, or ``WithFollowing``.
 
+  In clang-format 13 and 14 it was named ``IndentRequires``.
+
   .. code-block:: c++
 
      true:
      template <typename It>
        requires Iterator<It>
      void sort(It begin, It end) {
        //....
      }

clang/include/clang/Format/Format.h

enum BreakBeforeConceptDeclarationsStyle {
     /// \code
     ///   template <typename T>
     ///   concept C = ...;
     /// \endcode
     BBCDS_Always,
   };
 
   /// The concept declaration style to use.
-  /// \version 13
+  /// \version 12
   BreakBeforeConceptDeclarationsStyle BreakBeforeConceptDeclarations;
 
   /// If ``true``, ternary operators will be placed after line breaks.
   /// \code
   ///    true:
   ///    veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongDescription
   ///        ? firstValue
   ///        : SecondValueVeryVeryVeryVeryLong;
enum EmptyLineBeforeAccessModifierStyle : unsigned char {
     ///
     ///   protected:
     ///   };
     /// \endcode
     ELBAMS_Always,
   };
 
   /// Defines in which cases to put empty line before access modifiers.
-  /// \version 13
+  /// \version 12
   EmptyLineBeforeAccessModifierStyle EmptyLineBeforeAccessModifier;
 
   /// If ``true``, clang-format detects whether function calls and
   /// definitions are formatted with one parameter per line.
   ///
   /// Each call can be bin-packed, one-per-line or inconclusive. If it is
   /// inconclusive, e.g. completely on one line, but a decision needs to be
   /// made, clang-format analyzes whether there are other bin-packed cases in

   };
 
   /// IndentExternBlockStyle is the type of indenting of extern blocks.
   /// \version 12
   IndentExternBlockStyle IndentExternBlock;
 
   /// Indent the requires clause in a template. This only applies when
   /// ``RequiresClausePosition`` is ``OwnLine``, or ``WithFollowing``.
+  ///
+  /// In clang-format 13 and 14 it was named ``IndentRequires``.
   /// \code
   ///    true:
   ///    template <typename It>
   ///      requires Iterator<It>
   ///    void sort(It begin, It end) {
   ///      //....
   ///    }
   ///
   ///    false:
   ///    template <typename It>
   ///    requires Iterator<It>
   ///    void sort(It begin, It end) {
   ///      //....
   ///    }
   /// \endcode
-  /// \version 13
+  /// \version 15
   bool IndentRequiresClause;
 
   /// The number of columns to use for indentation.
   /// \code
   ///    IndentWidth: 3
   ///
   ///    void f() {
   ///       someFunction();