Revert "[clang-format] [PR25010] AllowShortIfStatementsOnASingleLine not working if an "else" statement is present"
This reverts commit b358cbb9b78389e20f7be36e1a98e26515c3ecce.
llvm-svn: 356030
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index d4a56d3..582b9d9 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -365,47 +365,10 @@
};
void f() { bar(); }
-**AllowShortIfStatementsOnASingleLine** (``ShortIfStyle``)
- Dependent on the value, ``if (a) return 0;`` can be put on a
- single line.
- Possible values:
- * ``SIS_Never`` (in configuration: ``Never``)
- Do not allow short if functions.
-
- .. code-block:: c++
-
- if (a)
- return;
- else
- return;
-
- * ``SIS_WithoutElse`` (in configuration: ``WithoutElse``)
- Allow short if functions on the same line, as long as else
- is not a compound statement.
-
- .. code-block:: c++
-
- if (a) return;
- else
- return;
-
- if (a)
- return;
- else {
- return;
- }
-
- * ``SIS_Always`` (in configuration: ``Always``)
- Allow short if statements even if the else is a compound statement.
-
- .. code-block:: c++
-
- if (a) return;
- else {
- return;
- }
+**AllowShortIfStatementsOnASingleLine** (``bool``)
+ If ``true``, ``if (a) return;`` can be put on a single line.
**AllowShortLoopsOnASingleLine** (``bool``)
If ``true``, ``while (true) continue;`` can be put on a single