Skip to content

Commit 6dc49e5

Browse files
committed
clang-format: Always break template declarations
I find this format easier to read, because the definitions are at the expected indentation, making it easier to find what I'm looking for.
1 parent 512ebf0 commit 6dc49e5

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AllowShortLoopsOnASingleLine: false
2020
AlwaysBreakAfterDefinitionReturnType: None
2121
AlwaysBreakAfterReturnType: None
2222
AlwaysBreakBeforeMultilineStrings: false
23-
AlwaysBreakTemplateDeclarations: MultiLine
23+
AlwaysBreakTemplateDeclarations: Yes
2424
BinPackArguments: false
2525
BinPackParameters: false
2626
BraceWrapping:

src/StaticStack.h

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#include <array>
22
#include <cstddef>
33

4-
template <typename T, size_t N> class StaticStack {
4+
template <typename T, size_t N>
5+
class StaticStack {
56
public:
67
T Pop();
78
void Push(T element);
@@ -15,24 +16,28 @@ template <typename T, size_t N> class StaticStack {
1516
};
1617

1718
// Returns random data when popping from empty array.
18-
template <typename T, size_t N> T StaticStack<T, N>::Pop() {
19+
template <typename T, size_t N>
20+
T StaticStack<T, N>::Pop() {
1921
if (stackPointer > 0) {
2022
stackPointer--;
2123
}
2224
return elementArray[stackPointer];
2325
}
2426

25-
template <typename T, size_t N> void StaticStack<T, N>::Push(T element) {
27+
template <typename T, size_t N>
28+
void StaticStack<T, N>::Push(T element) {
2629
if (stackPointer < elementArray.size()) {
2730
elementArray[stackPointer] = element;
2831
stackPointer++;
2932
}
3033
}
3134

32-
template <typename T, size_t N> void StaticStack<T, N>::Reset() {
35+
template <typename T, size_t N>
36+
void StaticStack<T, N>::Reset() {
3337
stackPointer = 0;
3438
}
3539

36-
template <typename T, size_t N> T StaticStack<T, N>::Top() {
40+
template <typename T, size_t N>
41+
T StaticStack<T, N>::Top() {
3742
return elementArray[stackPointer - 1];
3843
}

src/components/utility/LinearApproximation.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ namespace Pinetime {
77
namespace Utility {
88

99
// based on: https://github.com/SHristov92/LinearApproximation/blob/main/Linear.h
10-
template <typename Key, typename Value, std::size_t Size> class LinearApproximation {
10+
template <typename Key, typename Value, std::size_t Size>
11+
class LinearApproximation {
1112
using Point = struct {
1213
Key key;
1314
Value value;

src/displayapp/screens/Screen.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ namespace Pinetime {
1010

1111
namespace Screens {
1212

13-
template <class T> class DirtyValue {
13+
template <class T>
14+
class DirtyValue {
1415
public:
1516
DirtyValue() = default; // Use NSDMI
1617

src/displayapp/screens/ScreenList.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace Pinetime {
1212

1313
enum class ScreenListModes { UpDown, RightLeft, LongPress };
1414

15-
template <size_t N> class ScreenList : public Screen {
15+
template <size_t N>
16+
class ScreenList : public Screen {
1617
public:
1718
ScreenList(DisplayApp* app,
1819
uint8_t initScreen,

0 commit comments

Comments
 (0)