reformat preps

.clang-format

@@ -16,7 +16,6 @@ AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:   
@@ -38,7 +37,6 @@ BraceWrapping:
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Attach
 BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
@@ -81,58 +79,22 @@ MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-ObjCBinPackProtocolList: Never
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 100
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
-RawStringFormats: 
-  - Language:        Cpp
-    Delimiters:      
-      - cc
-      - CC
-      - cpp
-      - Cpp
-      - CPP
-      - 'c++'
-      - 'C++'
-    CanonicalDelimiter: ''
-    BasedOnStyle:    google
-  - Language:        TextProto
-    Delimiters:      
-      - pb
-      - PB
-      - proto
-      - PROTO
-    EnclosingFunctions: 
-      - EqualsProto
-      - EquivToProto
-      - PARSE_PARTIAL_TEXT_PROTO
-      - PARSE_TEST_PROTO
-      - PARSE_TEXT_PROTO
-      - ParseTextOrDie
-      - ParseTextProtoOrDie
-    CanonicalDelimiter: ''
-    BasedOnStyle:    google
+BasedOnStyle:    google
 ReflowComments:  true
 SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
 SpacesInAngles:  false

lib/Basics/Common.h

@@ -32,8 +32,10 @@
 
 // debug malloc for Windows (only used when DEBUG is set)
 #define _CRTDBG_MAP_ALLOC
+// clang-format off
 #include <stdlib.h>
 #include <crtdbg.h>
+// clang-format on
 
 #ifndef NOMINMAX
 #define NOMINMAX
@@ -42,8 +44,10 @@
 #endif
 
 #define TRI_WITHIN_COMMON 1
+// clang-format off
 #include "Basics/operating-system.h"
 #include "Basics/application-exit.h"
+// clang-format on
 #undef TRI_WITHIN_COMMON
 
 #include <ctype.h>
@@ -167,6 +171,7 @@ typedef long suseconds_t;
 #include <vector>
 
 #define TRI_WITHIN_COMMON 1
+// clang-format off
 #include "Basics/voc-errors.h"
 #include "Basics/error.h"
 #include "Basics/debugging.h"
@@ -174,6 +179,7 @@ typedef long suseconds_t;
 #include "Basics/memory.h"
 #include "Basics/system-compiler.h"
 #include "Basics/system-functions.h"
+// clang-format on
 #undef TRI_WITHIN_COMMON
 
 #ifdef _WIN32

lib/Basics/VelocyPackDumper.cpp

@@ -27,10 +27,12 @@
 #include "Logger/Logger.h"
 
 #include <velocypack/velocypack-common.h>
+
 #include <velocypack/AttributeTranslator.h>
-#include "velocypack/Iterator.h"
+#include <velocypack/Iterator.h>
 #include <velocypack/Options.h>
 #include <velocypack/Slice.h>
+
 #include <velocypack/velocypack-aliases.h>
 
 using namespace arangodb::basics;

utils/reformat.sh

@@ -3,5 +3,5 @@
 find arangod arangosh lib enterprise \
      -name Zip -prune -o \
      -type f "(" -name "*.cpp" -o -name "*.h" ")" \
-     "!" "(" -name "tokens.*" -o -name "v8-json.*" -o -name "voc-errors.*" -o -name "grammar.*" -o -name "xxhash.*" ")" | \
+     "!" "(" -name "tokens.*" -o -name "v8-json.*" -o -name "voc-errors.*" -o -name "grammar.*" -o -name "xxhash.*" -o -name "exitcodes.*" ")" | \
      xargs clang-format -i -verbose