From 0a6618705389543191a8c44278d4c6791c84602a Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Mon, 9 Apr 2018 11:54:39 -0700
Subject: Add lint checking for Objective-C++ sources (#1048)

* lint.sh now lints Objective-C++ too

* cpplint checks system-style includes that should be user-style

This prevents it from recognizing project sources as if they were C
system headers and then complaining that they're in the wrong place.

* cpplint checks #imports and #includes

* cpplint checks that C++ system headers aren't #imported

* cpplint checks for C system headers that could be C++ system headers

* cpplint checks that Objective-C sources include their headers
---
 Firestore/Source/API/FIRDocumentReference.mm | 4 ++--
 Firestore/Source/API/FIRFieldPath.mm         | 3 ++-
 Firestore/Source/API/FIRFirestore.mm         | 7 +++----
 Firestore/Source/API/FIRFirestoreVersion.mm  | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'Firestore/Source/API')

diff --git a/Firestore/Source/API/FIRDocumentReference.mm b/Firestore/Source/API/FIRDocumentReference.mm
index cc52d45..67e401d 100644
--- a/Firestore/Source/API/FIRDocumentReference.mm
+++ b/Firestore/Source/API/FIRDocumentReference.mm
@@ -16,11 +16,11 @@
 
 #import "FIRDocumentReference.h"
 
+#import <GRPCClient/GRPCCall.h>
+
 #include <memory>
 #include <utility>
 
-#import <GRPCClient/GRPCCall.h>
-
 #import "FIRFirestoreErrors.h"
 #import "FIRSnapshotMetadata.h"
 #import "Firestore/Source/API/FIRCollectionReference+Internal.h"
diff --git a/Firestore/Source/API/FIRFieldPath.mm b/Firestore/Source/API/FIRFieldPath.mm
index c651160..d0d8714 100644
--- a/Firestore/Source/API/FIRFieldPath.mm
+++ b/Firestore/Source/API/FIRFieldPath.mm
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "FIRFieldPath.h"
 
 #include <functional>
 #include <string>
 #include <utility>
 #include <vector>
 
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
 #import "Firestore/Source/Util/FSTUsageValidation.h"
 
 #include "Firestore/core/src/firebase/firestore/model/field_path.h"
diff --git a/Firestore/Source/API/FIRFirestore.mm b/Firestore/Source/API/FIRFirestore.mm
index 45d67cf..fe461d6 100644
--- a/Firestore/Source/API/FIRFirestore.mm
+++ b/Firestore/Source/API/FIRFirestore.mm
@@ -16,14 +16,14 @@
 
 #import "FIRFirestore.h"
 
-#include <memory>
-#include <utility>
-
 #import <FirebaseCore/FIRApp.h>
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRLogger.h>
 #import <FirebaseCore/FIROptions.h>
 
+#include <memory>
+#include <utility>
+
 #import "FIRFirestoreSettings.h"
 #import "Firestore/Source/API/FIRCollectionReference+Internal.h"
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
@@ -31,7 +31,6 @@
 #import "Firestore/Source/API/FIRTransaction+Internal.h"
 #import "Firestore/Source/API/FIRWriteBatch+Internal.h"
 #import "Firestore/Source/API/FSTUserDataConverter.h"
-
 #import "Firestore/Source/Core/FSTFirestoreClient.h"
 #import "Firestore/Source/Util/FSTAssert.h"
 #import "Firestore/Source/Util/FSTDispatchQueue.h"
diff --git a/Firestore/Source/API/FIRFirestoreVersion.mm b/Firestore/Source/API/FIRFirestoreVersion.mm
index b1fe480..8ebe814 100644
--- a/Firestore/Source/API/FIRFirestoreVersion.mm
+++ b/Firestore/Source/API/FIRFirestoreVersion.mm
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import "Firestore/Source/API/FIRFirestoreVersion.h"
+
 #ifndef FIRFirestore_VERSION
 #error "FIRFirestore_VERSION is not defined: add -DFIRFirestore_VERSION=... to the build invocation"
 #endif
-- 
cgit v1.2.3