sstwcw created this revision.
sstwcw added reviewers: HazardyKnusperkeks, MyDeveloperDay, owenpan, rymiel.
Herald added subscribers: cfe-commits, JDevlieghere.
Herald added projects: All, clang, clang-format.
sstwcw requested review of this revision.
Herald added a comment.
NOTE: Clang-Format Team Automated Review Comment
It looks like your clang-format review does not contain any unit tests, please
try to ensure all code changes have a unit test (unless this is an `NFC` or
refactoring, adding documentation etc..)
Add you unit tests in `clang/unittests/Format` and build `ninja FormatTests` we
recommend using the `verifyFormat(xxx)` format of unit tests rather than
`EXPECT_EQ` as this will ensure you change is tolerant to random whitespace
changes (see FormatTest.cpp as an example)
For situations where your change is altering the TokenAnnotator.cpp which can
happen if you are trying to improve the annotation phase to ensure we are
correctly identifying the type of a token, please add a token annotator test in
`TokenAnnotatorTest.cpp`
There are two options that do much the same thing, but for different
languages. With the addition to the doc, the user is less likely to
configure the wrong option and get frustrated that it doesn't work.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D147422
Files:
clang/docs/ClangFormatStyleOptions.rst
clang/include/clang/Format/Format.h
Index: clang/include/clang/Format/Format.h
===================================================================
--- clang/include/clang/Format/Format.h
+++ clang/include/clang/Format/Format.h
@@ -3748,7 +3748,8 @@
/// \version 7
bool SpaceBeforeInheritanceColon;
- /// If ``true``, a space will be add before a JSON colon.
+ /// If ``true``, a space will be add before a JSON colon. For other
languages,
+ /// use ``SpacesInContainerLiterals`` instead.
/// \code
/// true: false:
/// { {
@@ -4031,8 +4032,9 @@
/// \version 10
bool SpacesInConditionalStatement;
- /// If ``true``, spaces are inserted inside container literals (e.g.
- /// ObjC and Javascript array and dict literals).
+ /// If ``true``, spaces are inserted inside container literals (e.g. ObjC
and
+ /// Javascript array and dict literals). For JSON, use
+ /// ``SpaceBeforeJsonColon`` instead.
/// \code{.js}
/// true: false:
/// var arr = [ 1, 2, 3 ]; vs. var arr = [1, 2, 3];
Index: clang/docs/ClangFormatStyleOptions.rst
===================================================================
--- clang/docs/ClangFormatStyleOptions.rst
+++ clang/docs/ClangFormatStyleOptions.rst
@@ -4781,7 +4781,8 @@
.. _SpaceBeforeJsonColon:
**SpaceBeforeJsonColon** (``Boolean``) :versionbadge:`clang-format 17` :ref:`¶
<SpaceBeforeJsonColon>`
- If ``true``, a space will be add before a JSON colon.
+ If ``true``, a space will be add before a JSON colon. For other languages,
+ use ``SpacesInContainerLiterals`` instead.
.. code-block:: c++
@@ -5099,8 +5100,9 @@
.. _SpacesInContainerLiterals:
**SpacesInContainerLiterals** (``Boolean``) :versionbadge:`clang-format 3.7`
:ref:`¶ <SpacesInContainerLiterals>`
- If ``true``, spaces are inserted inside container literals (e.g.
- ObjC and Javascript array and dict literals).
+ If ``true``, spaces are inserted inside container literals (e.g. ObjC and
+ Javascript array and dict literals). For JSON, use
+ ``SpaceBeforeJsonColon`` instead.
.. code-block:: js
Index: clang/include/clang/Format/Format.h
===================================================================
--- clang/include/clang/Format/Format.h
+++ clang/include/clang/Format/Format.h
@@ -3748,7 +3748,8 @@
/// \version 7
bool SpaceBeforeInheritanceColon;
- /// If ``true``, a space will be add before a JSON colon.
+ /// If ``true``, a space will be add before a JSON colon. For other languages,
+ /// use ``SpacesInContainerLiterals`` instead.
/// \code
/// true: false:
/// { {
@@ -4031,8 +4032,9 @@
/// \version 10
bool SpacesInConditionalStatement;
- /// If ``true``, spaces are inserted inside container literals (e.g.
- /// ObjC and Javascript array and dict literals).
+ /// If ``true``, spaces are inserted inside container literals (e.g. ObjC and
+ /// Javascript array and dict literals). For JSON, use
+ /// ``SpaceBeforeJsonColon`` instead.
/// \code{.js}
/// true: false:
/// var arr = [ 1, 2, 3 ]; vs. var arr = [1, 2, 3];
Index: clang/docs/ClangFormatStyleOptions.rst
===================================================================
--- clang/docs/ClangFormatStyleOptions.rst
+++ clang/docs/ClangFormatStyleOptions.rst
@@ -4781,7 +4781,8 @@
.. _SpaceBeforeJsonColon:
**SpaceBeforeJsonColon** (``Boolean``) :versionbadge:`clang-format 17` :ref:`¶ <SpaceBeforeJsonColon>`
- If ``true``, a space will be add before a JSON colon.
+ If ``true``, a space will be add before a JSON colon. For other languages,
+ use ``SpacesInContainerLiterals`` instead.
.. code-block:: c++
@@ -5099,8 +5100,9 @@
.. _SpacesInContainerLiterals:
**SpacesInContainerLiterals** (``Boolean``) :versionbadge:`clang-format 3.7` :ref:`¶ <SpacesInContainerLiterals>`
- If ``true``, spaces are inserted inside container literals (e.g.
- ObjC and Javascript array and dict literals).
+ If ``true``, spaces are inserted inside container literals (e.g. ObjC and
+ Javascript array and dict literals). For JSON, use
+ ``SpaceBeforeJsonColon`` instead.
.. code-block:: js
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
