clang-format: add rule for pch.h and generated files (#2767)

microsoft · Jul 15, 2019 · ba92a18 · ba92a18
1 parent 67d7313
commit ba92a18
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.clang-format b/.clang-format
@@ -44,13 +44,18 @@ Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ForEachMacros:   [ FOR_EACH_RANGE, FOR_EACH, ]
+IncludeBlocks: Preserve
 IncludeCategories:
-  - Regex:           '^<.*\.h(pp)?>'
+  - Regex:           'pch.h'
+    Priority:        -1
+  - Regex:           '.*\.g\..*'
     Priority:        1
-  - Regex:           '^<.*'
+  - Regex:           '^<.*\.h(pp)?>'
     Priority:        2
-  - Regex:           '.*'
+  - Regex:           '^<.*'
     Priority:        3
+  - Regex:           '.*'
+    Priority:        4
 IndentCaseLabels: true
 IndentWidth:     2
 IndentWrappedFunctionNames: false

diff --git a/vnext/Universal.UnitTests/App.xaml.cpp b/vnext/Universal.UnitTests/App.xaml.cpp
@@ -5,8 +5,8 @@
 // Implementation of the App class.
 //
 
-#include "MainPage.xaml.h"
 #include "pch.h"
+#include "MainPage.xaml.h"
 
 using namespace ReactUWPUnitTests;
 

diff --git a/vnext/Universal.UnitTests/MainPage.xaml.cpp b/vnext/Universal.UnitTests/MainPage.xaml.cpp
@@ -5,8 +5,8 @@
 // Implementation of the MainPage class.
 //
 
-#include "MainPage.xaml.h"
 #include "pch.h"
+#include "MainPage.xaml.h"
 
 using namespace ReactUWPUnitTests;
 using namespace Platform;

diff --git a/vnext/Universal.UnitTests/Tests/StringConversionTests_Universal.cpp b/vnext/Universal.UnitTests/Tests/StringConversionTests_Universal.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+#include "pch.h"
 #include <../Chakra/Utf8DebugExtensions.h>
 #include <CppUnitTest.h>
 #include <string>
 #include <vector>
-#include "pch.h"
 
 using namespace facebook::react;
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;