diff options
| author |  willakat <willakat@users.noreply.github.com> | 2017-01-14 19:40:02 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-14 19:40:02 +0100 |
| commit | 4c06a100046db6f8756e245c351eb9420a272f93 (patch) | |
| tree | 51350f88fb37fea4c94c5787d0df32a3eb102ab1 /.clang-format | |
| parent | Merge branch 'master' into master (diff) | |
| parent | Merge pull request #1048 from dkess/proper-output-wrapping (diff) | |
| download | sway-4c06a100046db6f8756e245c351eb9420a272f93.tar.gz sway-4c06a100046db6f8756e245c351eb9420a272f93.tar.zst sway-4c06a100046db6f8756e245c351eb9420a272f93.zip | |
Merge branch 'master' into master
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format index 83d50545..5818da3c 100644 --- a/.clang-format +++ b/.clang-format | |||
| @@ -1,7 +1,16 @@ | |||
| 1 | BasedOnStyle: LLVM | 1 | BasedOnStyle: LLVM |
| 2 | IndentWidth: 8 | 2 | IndentWidth: 4 |
| 3 | TabWidth: 4 | ||
| 3 | UseTab: Always | 4 | UseTab: Always |
| 4 | BreakBeforeBraces: Attach | 5 | BreakBeforeBraces: Attach |
| 5 | AllowShortIfStatementsOnASingleLine: false | 6 | AllowShortIfStatementsOnASingleLine: false |
| 6 | IndentCaseLabels: false | 7 | IndentCaseLabels: false |
| 7 | ColumnLimit: 0 | 8 | SortIncludes: false |
| 9 | ColumnLimit: 80 | ||
| 10 | AlignAfterOpenBracket: DontAlign | ||
| 11 | BinPackParameters: false | ||
| 12 | BinPackArguments: false | ||
| 13 | ContinuationIndentWidth: 8 | ||
| 14 | AllowAllParametersOfDeclarationOnNextLine: false | ||
| 15 | AllowShortLoopsOnASingleLine: true | ||
| 16 | ReflowComments: false | ||