diff --git a/include/flatbuffers/flexbuffers.h b/include/flatbuffers/flexbuffers.h
index 3268eabf40d..c71928e8a97 100644
--- a/include/flatbuffers/flexbuffers.h
+++ b/include/flatbuffers/flexbuffers.h
@@ -1397,10 +1397,12 @@ class Builder FLATBUFFERS_FINAL_CLASS {
 
   template<typename T> static Type GetScalarType() {
     static_assert(flatbuffers::is_scalar<T>::value, "Unrelated types");
-    return flatbuffers::is_floating_point<T>::value ? FBT_FLOAT
-           : flatbuffers::is_same<T, bool>::value
-               ? FBT_BOOL
-               : (flatbuffers::is_unsigned<T>::value ? FBT_UINT : FBT_INT);
+    return flatbuffers::is_floating_point<T>::value
+               ? FBT_FLOAT
+               : flatbuffers::is_same<T, bool>::value
+                     ? FBT_BOOL
+                     : (flatbuffers::is_unsigned<T>::value ? FBT_UINT
+                                                           : FBT_INT);
   }
 
  public:
diff --git a/src/idl_gen_as.cpp b/src/idl_gen_as.cpp
index 046f29c811b..e33cd321fce 100644
--- a/src/idl_gen_as.cpp
+++ b/src/idl_gen_as.cpp
@@ -231,8 +231,7 @@ class AsGenerator : public BaseGenerator {
 
       case BASE_TYPE_VECTOR: return "[]";
 
-      case BASE_TYPE_LONG:
-        return value.constant + " as i64";
+      case BASE_TYPE_LONG: return value.constant + " as i64";
       case BASE_TYPE_ULONG: {
         return value.constant + " as u64";
       }
@@ -259,10 +258,8 @@ class AsGenerator : public BaseGenerator {
     switch (type.base_type) {
       case BASE_TYPE_BOOL: return "boolean";
       case BASE_TYPE_FLOAT: return "f32";
-      case BASE_TYPE_LONG:
-        return "i64";
-      case BASE_TYPE_ULONG:
-        return "u64";
+      case BASE_TYPE_LONG: return "i64";
+      case BASE_TYPE_ULONG: return "u64";
       default:
         if (IsScalar(type.base_type)) {
           if (type.enum_def) {
@@ -825,8 +822,7 @@ class AsGenerator : public BaseGenerator {
       // a string that contains values for things that can be created inline or
       // the variable name from field_offset_decl
       std::string field_offset_val;
-      const auto field_default_val =
-          GenDefaultValue(field, imports);
+      const auto field_default_val = GenDefaultValue(field, imports);
 
       // Emit a scalar field
       const auto is_string = IsString(field.value.type);
@@ -1376,7 +1372,8 @@ class AsGenerator : public BaseGenerator {
         code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
         if (field.value.type.base_type == BASE_TYPE_BOOL) { code += "+"; }
         code += argname + ", ";
-        if (!IsScalar(field.value.type.base_type) || IsLong(field.value.type.base_type) || HasNullDefault(field)) {
+        if (!IsScalar(field.value.type.base_type) ||
+            IsLong(field.value.type.base_type) || HasNullDefault(field)) {
           code += "0";
         } else {
           if (field.value.type.base_type == BASE_TYPE_BOOL) { code += "+"; }
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index 14114c357ca..820943394e7 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -1009,9 +1009,10 @@ class CppGenerator : public BaseGenerator {
                     ? bt - BASE_TYPE_UTYPE + ET_UTYPE
                     : ET_SEQUENCE;
       int ref_idx = -1;
-      std::string ref_name = type.struct_def ? WrapInNameSpace(*type.struct_def)
-                             : type.enum_def ? WrapInNameSpace(*type.enum_def)
-                                             : "";
+      std::string ref_name =
+          type.struct_def
+              ? WrapInNameSpace(*type.struct_def)
+              : type.enum_def ? WrapInNameSpace(*type.enum_def) : "";
       if (!ref_name.empty()) {
         auto rit = type_refs.begin();
         for (; rit != type_refs.end(); ++rit) {
diff --git a/src/idl_gen_csharp.cpp b/src/idl_gen_csharp.cpp
index fd70c4c06aa..681ab6d642f 100644
--- a/src/idl_gen_csharp.cpp
+++ b/src/idl_gen_csharp.cpp
@@ -1515,10 +1515,11 @@ class CSharpGenerator : public BaseGenerator {
         case BASE_TYPE_ARRAY: {
           auto type_name = GenTypeGet_ObjectAPI(field.value.type, opts);
           auto length_str = NumToString(field.value.type.fixed_length);
-          auto unpack_method = field.value.type.struct_def == nullptr ? ""
-                               : field.value.type.struct_def->fixed
-                                   ? ".UnPack()"
-                                   : "?.UnPack()";
+          auto unpack_method = field.value.type.struct_def == nullptr
+                                   ? ""
+                                   : field.value.type.struct_def->fixed
+                                         ? ".UnPack()"
+                                         : "?.UnPack()";
           code += start + "new " + type_name.substr(0, type_name.length() - 1) +
                   length_str + "];\n";
           code += "    for (var _j = 0; _j < " + length_str + "; ++_j) { _o." +
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index f486e07886b..16397c0a3c2 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -3757,9 +3757,7 @@ Offset<reflection::EnumVal> EnumVal::Serialize(FlatBufferBuilder *builder,
   auto docs__ = parser.opts.binary_schema_comments
                     ? builder->CreateVectorOfStrings(doc_comment)
                     : 0;
-  return reflection::CreateEnumVal(
-      *builder, name__, value,
-      type__, docs__);
+  return reflection::CreateEnumVal(*builder, name__, value, type__, docs__);
 }
 
 bool EnumVal::Deserialize(const Parser &parser,
diff --git a/tests/test.cpp b/tests/test.cpp
index 868003ebe72..1b8fc21d4d6 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1554,9 +1554,7 @@ void FuzzTest2() {
           }
       }
       AddToSchemaAndInstances(deprecated ? "(deprecated);\n" : ";\n",
-                              deprecated      ? ""
-                              : is_last_field ? "\n"
-                                              : ",\n");
+                              deprecated ? "" : is_last_field ? "\n" : ",\n");
     }
     AddToSchemaAndInstances("}\n\n", "}");
   }