From 1182dc053b6e51047a5f994e47aeaf376a8e01ce Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Thu, 14 May 2020 19:27:18 -0700
Subject: [PATCH] sort includes CHIP_Framework_iOS (#717)

---
 src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h                | 10 ++++++----
 .../CHIP/CHIP/CHIPManualSetupPayloadParser.h           |  4 ++--
 .../CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h           |  6 ++++--
 .../CHIP/CHIPTests/CHIPSetupPayloadParserTests.m       |  6 ++++--
 .../CHIPQRCodeReader/UI/ViewController.h               |  2 +-
 .../CHIPQRCodeReader/UI/ViewController.m               |  6 +++++-
 .../CHIPQRCodeReader/CHIPQRCodeReader/main.m           |  1 -
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h
index d4b11bcffe111e..5dfb9f8c97fd79 100644
--- a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h
+++ b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIP.h
@@ -18,11 +18,13 @@
  *    limitations under the License.
  */
 
-#import <Foundation/Foundation.h>
-#import "CHIPSetupPayload.h"
-#import "CHIPQRCodeSetupPayloadParser.h"
-#import "CHIPManualSetupPayloadParser.h"
+// pull together CHIP headers
 #import "CHIPError.h"
+#import "CHIPManualSetupPayloadParser.h"
+#import "CHIPQRCodeSetupPayloadParser.h"
+#import "CHIPSetupPayload.h"
+
+#import <Foundation/Foundation.h>
 //! Project version number for CHIP.
 FOUNDATION_EXPORT double CHIPVersionNumber;
 
diff --git a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPManualSetupPayloadParser.h b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPManualSetupPayloadParser.h
index b2775f8e4baf43..1fb8548a4982f4 100644
--- a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPManualSetupPayloadParser.h
+++ b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPManualSetupPayloadParser.h
@@ -17,10 +17,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+// module header
+#import "CHIPSetupPayload.h"
 
 #import <Foundation/Foundation.h>
-#import "CHIPSetupPayload.h"
-#import "CHIPError.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h
index a7d4c17d8a2ec5..a7361975c303d0 100644
--- a/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h
+++ b/src/CHIP_Framework_iOS/CHIP/CHIP/CHIPQRCodeSetupPayloadParser.h
@@ -17,9 +17,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#import <Foundation/Foundation.h>
+
+// module header
 #import "CHIPSetupPayload.h"
-#import "CHIPError.h"
+
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/src/CHIP_Framework_iOS/CHIP/CHIPTests/CHIPSetupPayloadParserTests.m b/src/CHIP_Framework_iOS/CHIP/CHIPTests/CHIPSetupPayloadParserTests.m
index 30e6cdae4d1cd9..8e26c1f0edc5f2 100644
--- a/src/CHIP_Framework_iOS/CHIP/CHIPTests/CHIPSetupPayloadParserTests.m
+++ b/src/CHIP_Framework_iOS/CHIP/CHIPTests/CHIPSetupPayloadParserTests.m
@@ -17,11 +17,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-#import <XCTest/XCTest.h>
+// module headers
 #import "CHIPManualSetupPayloadParser.h"
 #import "CHIPQRCodeSetupPayloadParser.h"
 
+// system dependencies
+#import <XCTest/XCTest.h>
+
 @interface CHIPSetupPayloadParserTests : XCTestCase
 
 @end
diff --git a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.h b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.h
index 333e15e1a1d7ec..fc73390696edc7 100644
--- a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.h
+++ b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.h
@@ -18,8 +18,8 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
 #import <AVFoundation/AVFoundation.h>
+#import <UIKit/UIKit.h>
 
 @interface ViewController : UIViewController <AVCaptureMetadataOutputObjectsDelegate>
 
diff --git a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.m b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.m
index 333107948a6809..27054dceec6677 100644
--- a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.m
+++ b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/UI/ViewController.m
@@ -17,9 +17,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
+// module header
 #import "ViewController.h"
+
+// local imports
 #import <CHIP/CHIP.h>
+
+// system imports
 #import <AVFoundation/AVFoundation.h>
 
 #define INDICATOR_DELAY 0.5 * NSEC_PER_SEC
diff --git a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/main.m b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/main.m
index 003bc111fcd94c..404053ae91a3b8 100644
--- a/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/main.m
+++ b/src/CHIP_Framework_iOS/CHIPQRCodeReader/CHIPQRCodeReader/main.m
@@ -18,7 +18,6 @@
  *    limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
 int main(int argc, char * argv[])