Apply clang-format

.clang-format

@@ -7,12 +7,10 @@ BasedOnStyle:  Microsoft
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
 AlignEscapedNewlines: DontAlign
-AllowShortBlocksOnASingleLine: Never
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
-BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: true
   AfterUnion: true
@@ -24,69 +22,10 @@ IncludeBlocks: Regroup
 IncludeCategories:
   - Regex: '^"(stdafx.h|pch.h|precomp.h)"$'
     Priority: -1
-MacroBlockBegin: '^BEGIN_COM_MAP$|^BEGIN_CONNECTION_POINT_MAP$|^BEGIN_HELPER_NODEMAP$|^BEGIN_MODULE$|^BEGIN_MSG_MAP$|^BEGIN_OBJECT_MAP$|^BEGIN_TEST_CLASS$|^BEGIN_TEST_METHOD$|^BEGIN_TEST_METHOD_PROPERTIES$'
-MacroBlockEnd: '^END_COM_MAP$|^END_CONNECTION_POINT_MAP$|^END_HELPER_NODEMAP$|^END_MODULE$|^END_MSG_MAP$|^END_OBJECT_MAP$|^END_TEST_CLASS$|^END_TEST_METHOD$|^END_TEST_METHOD_PROPERTIES$'
 NamespaceIndentation: Inner
 PenaltyExcessCharacter: 1
 PointerAlignment: Left
 SortIncludes: false
 Standard: Cpp11
-StatementMacros: [
-  _Acquires_exclusive_lock_,
-  _Acquires_lock_,
-  _Acquires_nonreentrant_lock_,
-  _Acquires_shared_lock_,
-  _Analysis_assume_smart_lock_acquired_,
-  _Analysis_assume_smart_lock_released_,
-  _Create_lock_level_,
-  _Detaches_lock_,
-  _Function_class_,
-  _Global_cancel_spin_lock_,
-  _Global_critical_region_,
-  _Global_interlock_,
-  _Global_priority_region_,
-  _Has_lock_kind_,
-  _Has_lock_level_,
-  _IRQL_always_function_max_,
-  _IRQL_always_function_min_,
-  _IRQL_raises_,
-  _IRQL_requires_,
-  _IRQL_requires_max_,
-  _IRQL_requires_min_,
-  _IRQL_requires_same_,
-  _IRQL_restores_,
-  _IRQL_restores_global_,
-  _IRQL_saves_,
-  _IRQL_saves_global_,
-  _Lock_level_order_,
-  _Moves_lock_,
-  _Must_inspect_result_,
-  _No_competing_thread_,
-  _Post_same_lock_,
-  _Post_writable_byte_size_,
-  _Pre_satisfies_,
-  _Releases_exclusive_lock_,
-  _Releases_lock_,
-  _Releases_nonreentrant_lock_,
-  _Releases_shared_lock_,
-  _Replaces_lock_,
-  _Requires_exclusive_lock_held_,
-  _Requires_lock_held_,
-  _Requires_lock_not_held_,
-  _Requires_no_locks_held_,
-  _Requires_shared_lock_held_,
-  _Ret_maybenull_,
-  _Ret_range_,
-  _Success_,
-  _Swaps_locks_,
-  _Use_decl_annotations_,
-  _When_,
-  RpcEndExcept,
-]
-TabWidth:        4
-TypenameMacros: [
-  IFACEMETHOD,
-  STDMETHOD,
-]
 UseTab:          Never
 ...

.editorconfig

@@ -1,6 +1,6 @@
 root = true
 
-[**.{java,mm,cs,ts,js,tsx}]
+[**.{cpp,h,java,mm,cs}]
 indent_style = spaces
 indent_size = 4
 charset = utf-8

.gitignore

@@ -2,7 +2,6 @@
 ## files generated by popular Visual Studio add-ons.
 .gitconfig
 
-scripts/hooks/pre-push
 scripts/hooks/pre-commit
 
 # User-specific files

README.md

@@ -33,14 +33,14 @@ PS: Latest Build Status is against `main` branch.
 
 We require the C++ code inside this project to follow the clang-format. If you change them, please make sure your changed files are formatted correctly.
 
-Make sure clang-format version 12.0.0 and above version are used.
+Make sure clang-format version 12.0.0 and above version is used.
 
 ### IDE integration
 ClangFormat describes a set of tools that are built on top of LibFormat. It can support your workflow in a variety of ways including a standalone tool and editor integrations. For details, refer to https://clang.llvm.org/docs/ClangFormat.html
 
-### Format with scripts
+### Format with script
 Two scripts are provided to help you format files.
-- Windows only user: use FormatSource.ps1. This script use clang-format.exe which is built into Visual Studio by default.
+- Windows user only: use FormatSource.ps1. This script use clang-format.exe which is built into Visual Studio by default.
 
 	Execute below command in the root folder of the project
 
@@ -54,7 +54,7 @@ If it's the first time to run the script, make sure clang-format version 12.0.0
 clang-format version 12.0.0
 ```
 
-- Both Windows and MAC user: Use clang-format npmjs package
+- Both Windows and MAC users: Use clang-format npmjs package
 
 	Execute below command in source/nodejs
 
@@ -64,27 +64,20 @@ clang-format version 12.0.0
 
 Make sure `npm install` is run before.
 
-#### Setup Git hooks
-This is an optional process and a one time setup for Windows user only. When you `git commit` or `git push`, it will automatically do the format check and ask you to correct it if format error detected.
+### Use Git pre-commit hook
+`git pre-commit hook` is an optional process. When you run `git commit`, it will automatically do the format check and auto fix the format if error detected.
 
-```
-scripts\SetupClangFormat.bat
-```
-
-then choose `scripts/hooks/pre-commit.txt` or `scripts/hooks/pre-commit.txt` and remove the `.txt` to enable that hook.
-
-### Two ways to format the files
+First make sure clang-format binary is installed in your dev enviroment.
+Then modify scripts/hooks/pre-commit to make sure clangFormat is point to the correct path.
+And finally setup the git hook.
 
-### 1) Use script to format files before you submit the change 
-
-`PowerShell.exe -ExecutionPolicy Bypass scripts\FormatSource.ps1 -ModifiedOnly $False`
-
-or
-
-`PowerShell.exe -ExecutionPolicy Bypass scripts\FormatSource.ps1 -ModifiedOnly $False -Path yourfolder`
+Two ways to setup the hook:
+1. Copy `scripts/hooks/pre-commit` to `.git/hooks`
+2. `git config --local core.hooksPath scripts/hooks`
 
+then choose `scripts/hooks/pre-commit.txt` or `scripts/hooks/pre-commit.txt` and remove the `.txt` to enable that hook.
 
-#### End User License Agreement for our binary packages
+## End User License Agreement for our binary packages
 Consumption of the AdaptiveCards binary packages are subject to the Microsoft EULA (End User License Agreement). Please see the relevant terms as listed below:
 - [UWP/.NET](https://github.com/microsoft/AdaptiveCards/blob/main/source/EULA-Windows.txt)
 - [Android/iOS](https://github.com/microsoft/AdaptiveCards/blob/main/source/EULA-Non-Windows.txt)

scripts/hooks/clangFormatFunc

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+endWith='\.(cpp|cc|h|hpp)$'
+ignoreFolder='/(PerfApp|android|ios|nodejs|vscode|community|dotnet)/'
+
+function checkFormat() {
+	if [ -z "$clangFormat" ]; then
+		echo '$clangFormat is not set correct in clangFormatCheck'
+		return 1
+	fi
+
+	for file in $(git diff-index --cached --name-only HEAD | grep -iE "${endWith}" | grep -iE -v "${ignoreFolder}"); do
+		"$clangFormat" --style=file -Werror --dry-run --verbose "$file"
+		if [ $? -ne 0 ]; then
+			echo "Bad format for $file"
+			return 1
+		fi
+	done
+	return 0
+}
+
+function fixFormat() {
+	for file in $(git diff-index --cached --name-only HEAD | grep -iE "${endWith}" | grep -iE -v "${ignoreFolder}"); do
+		"$clangFormat" --style=file -Werror -i --verbose "$file"
+		if [ $? -ne 0 ]; then
+			echo "clang-format auto fix failed for $file, please run below command manually:"
+			echo "  \"$clangFormat\" --style=file -Werror -i --verbose \"$file\""
+			return 1
+		fi
+	done
+	return 0
+}

scripts/hooks/pre-commit

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# clangFormat="c:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin\clang-format.exe"
+if [ -z "$clangFormat" ]; then
+	clangFormat="clang-format"
+else
+	if [[ ! -f "$clangFormat" ]]; then
+		echo "Can't find the binary $clangFormat"
+		exit 1
+	fi
+fi
+
+"$clangFormat" --version
+if [ "$?" -ne "0" ]; then
+	echo "'git commit' aborted! Please make sure clangFormat is set correctly in pre-commit."
+	exit 1
+fi
+
+. "scripts/hooks/clangFormatFunc"
+
+checkFormat
+
+if [ "$?" -ne "0" ]; then
+	echo "start auto fix clang-format"
+	fixFormat
+	if [ "$?" -ne "0" ]; then
+		echo "'git commit' aborted! Clang-format auto fix failed, and you have to manually fix the format issue."
+	else
+		echo "'git commit' aborted! But clang-format auto fix success, please re-run 'git add' and 'git commit'."
+	fi
+	exit 1
+else
+	echo "clang-format check passed, and will continue the commit"
+fi

source/nodejs/package.json

@@ -8,7 +8,8 @@
 		"start:all": "lerna run --parallel watch && lerna run --parallel start",
 		"audit-all": "lerna-audit",
 		"format": "clang-format-launcher --verbose",
-		"verify": "clang-format-launcher -verify --verbose"
+		"verify": "clang-format-launcher -verify --verbose",
+		"prepare": "cd ../.. && husky install source/nodejs/.husky"
 	},
 	"devDependencies": {
 		"@types/jest": "^27.0.2",

source/shared/cpp/ObjectModel/jsoncpp.cpp

@@ -68,6 +68,8 @@ license you like.
 // End of content of file: LICENSE
 // //////////////////////////////////////////////////////////////////////
 
+// clang-format off
+
 #include "pch.h"
 
 #ifdef USE_CPPCORECHECK
@@ -3315,13 +3317,11 @@ double Value::asDouble() const {
   case intValue:
     return static_cast<double>(value_.int_);
   case uintValue:
-// clang-format off
 #if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
     return static_cast<double>(value_.uint_);
 #else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
     return integerToDouble(value_.uint_);
 #endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-// clang-format on
   case realValue:
     return value_.real_;
   case nullValue:
@@ -3339,14 +3339,12 @@ float Value::asFloat() const {
   case intValue:
     return static_cast<float>(value_.int_);
   case uintValue:
-// clang-format off
 #if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
     return static_cast<float>(value_.uint_);
 #else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
     // This can fail (silently?) if the value is bigger than MAX_FLOAT.
     return static_cast<float>(integerToDouble(value_.uint_));
 #endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-// clang-format on
   case realValue:
     return static_cast<float>(value_.real_);
   case nullValue:
@@ -5398,3 +5396,5 @@ JSONCPP_OSTREAM& operator<<(JSONCPP_OSTREAM& sout, Value const& root) {
 #ifdef USE_CPPCORECHECK
 #pragma warning(pop)
 #endif
+
+// clang-format on

source/uwp/Renderer/lib/ElementTagContent.h

@@ -5,7 +5,7 @@
 
 namespace AdaptiveCards::Rendering::Uwp
 {
-	// clang-format off
+    // clang-format off
     interface __declspec(uuid("0331D653-957C-4385-A327-D326750C10B6")) IElementTagContent : IInspectable
     {
     public:
@@ -22,7 +22,7 @@ namespace AdaptiveCards::Rendering::Uwp
         virtual HRESULT get_IsStretchable(_Outptr_ boolean * isStretchable) = 0;
         virtual HRESULT put_IsStretchable(boolean isStretchable) = 0;
     };
-	// clang-format on
+    // clang-format on
 
     class ElementTagContent
         : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::WinRtClassicComMix>, IElementTagContent>