From a8ceb7e3f213216e4fb103a6a8687d007632f788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 6 Dec 2017 21:34:40 +0100
Subject: [PATCH] Style: Update definitions for clang-format 5.0.0

This will be the new standard from now on.
---
 .clang-format               | 50 +++++++++++++++++++++++++------------
 .travis.yml                 |  4 +--
 misc/travis/clang-format.sh |  2 +-
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/.clang-format b/.clang-format
index 0407a7aeb384..bc69a6a3a69f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,15 +1,14 @@
----
-BasedOnStyle:  LLVM
 # Commented out parameters are those with the same value as base LLVM style
 # We can uncomment them if we want to change their value, or enforce the
-# chosen value in case the base style changes (initial sync: Clang 3.9.1).
-...
-Language:        Cpp
+# chosen value in case the base style changes (last sync: Clang 5.0.0).
+---
+### General config, applies to all languages ###
+BasedOnStyle:  LLVM
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 # AlignConsecutiveAssignments: false
 # AlignConsecutiveDeclarations: false
-# AlignEscapedNewlinesLeft: false
+# AlignEscapedNewlines: Right
 # AlignOperands:   true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
@@ -36,22 +35,32 @@ AllowShortIfStatementsOnASingleLine: true
 #   BeforeCatch:     false
 #   BeforeElse:      false
 #   IndentBraces:    false
+#   SplitEmptyFunction: true
+#   SplitEmptyRecord: true
+#   SplitEmptyNamespace: true
 # BreakBeforeBinaryOperators: None
 # BreakBeforeBraces: Attach
+# BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: false
 # BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
 # BreakAfterJavaFieldAnnotations: false
 # BreakStringLiterals: true
 ColumnLimit:     0
 # CommentPragmas:  '^ IWYU pragma:'
-# ConstructorInitializerAllOnOneLineOrOnePerLine: false
-# ConstructorInitializerIndentWidth: 4
+# CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 Cpp11BracedListStyle: false
 # DerivePointerAlignment: false
 # DisableFormat:   false
 # ExperimentalAutoDetectBinPacking: false
-# ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+# FixNamespaceComments: true
+# ForEachMacros:
+#   - foreach
+#   - Q_FOREACH
+#   - BOOST_FOREACH
 IncludeCategories:
   - Regex:           '".*"'
     Priority:        1
@@ -59,7 +68,7 @@ IncludeCategories:
     Priority:        2
   - Regex:           '^<.*'
     Priority:        3
-# IncludeIsMainRegex: '$'
+# IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: true
 IndentWidth:     4
 # IndentWrappedFunctionNames: false
@@ -70,19 +79,19 @@ IndentWidth:     4
 # MacroBlockEnd:   ''
 # MaxEmptyLinesToKeep: 1
 # NamespaceIndentation: None
-ObjCBlockIndentWidth: 4
-# ObjCSpaceAfterProperty: false
-# ObjCSpaceBeforeProtocolList: true
+# PenaltyBreakAssignment: 2
 # PenaltyBreakBeforeFirstCallParameter: 19
 # PenaltyBreakComment: 300
 # PenaltyBreakFirstLessLess: 120
 # PenaltyBreakString: 1000
 # PenaltyExcessCharacter: 1000000
 # PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
+# PointerAlignment: Right
 # ReflowComments:  true
-SortIncludes:    true
+# SortIncludes:    true
+# SortUsingDeclarations: true
 # SpaceAfterCStyleCast: false
+# SpaceAfterTemplateKeyword: true
 # SpaceBeforeAssignmentOperators: true
 # SpaceBeforeParens: ControlStatements
 # SpaceInEmptyParentheses: false
@@ -92,7 +101,16 @@ SortIncludes:    true
 # SpacesInCStyleCastParentheses: false
 # SpacesInParentheses: false
 # SpacesInSquareBrackets: false
-Standard:        Cpp03
 TabWidth:        4
 UseTab:          Always
+---
+### C++ specific config ###
+Language:        Cpp
+Standard:        Cpp03
+---
+### ObjC specific config ###
+Language:        ObjC
+ObjCBlockIndentWidth: 4
+# ObjCSpaceAfterProperty: false
+# ObjCSpaceBeforeProtocolList: true
 ...
diff --git a/.travis.yml b/.travis.yml
index e10497ad7c93..c11a21aeef31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-3.9
+      - llvm-toolchain-trusty-5.0
     packages:
       - build-essential
       - scons
@@ -67,7 +67,7 @@ addons:
       #- mingw-w64
 
       # For style checks.
-      - clang-format-3.9
+      - clang-format-5.0
 
 install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "android" ]; then
diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh
index 741d3bff1b1e..2b30cf5ada29 100755
--- a/misc/travis/clang-format.sh
+++ b/misc/travis/clang-format.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CLANG_FORMAT=clang-format-3.9
+CLANG_FORMAT=clang-format-5.0
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
     # Check the whole commit range against $TRAVIS_BRANCH, the base merge branch