summaryrefslogtreecommitdiffstats
path: root/lldb
diff options
context:
space:
mode:
Diffstat (limited to 'lldb')
-rw-r--r--lldb/.clang-format8
-rw-r--r--lldb/packages/Python/lldbsuite/.clang-format4
2 files changed, 8 insertions, 4 deletions
diff --git a/lldb/.clang-format b/lldb/.clang-format
index 9b3aa8b7213..c698dc5d99c 100644
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@@ -1 +1,9 @@
BasedOnStyle: LLVM
+IndentWidth: 4
+ColumnLimit: 120
+BreakBeforeBraces: Allman
+AlwaysBreakAfterReturnType: All
+AllowShortFunctionsOnASingleLine: Inline
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+IndentCaseLabels: true
+AccessModifierOffset: -4
diff --git a/lldb/packages/Python/lldbsuite/.clang-format b/lldb/packages/Python/lldbsuite/.clang-format
deleted file mode 100644
index 7de7a512ad7..00000000000
--- a/lldb/packages/Python/lldbsuite/.clang-format
+++ /dev/null
@@ -1,4 +0,0 @@
-DisableFormat: true
-
-# Disabling formatting doesn't implicitly disable include sorting
-SortIncludes: false
OpenPOWER on IntegriCloud