From 11dccd0a45f87f8f0b095595e2e474bdb22f7692 Mon Sep 17 00:00:00 2001
From: Kassem Wridan <kwridan@bloomberg.net>
Date: Mon, 4 Jul 2022 08:11:00 +0100
Subject: [PATCH] Fix ordering of diagnostics scheme options

- The ordering for the runtime checker (main thread, thread performance) were incorrect
- This aligns the order with the order created by Xcode

Test Plan:

- Verify order matches that created by Xcode

e.g.

```xml
<TestAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      customLLDBInitFile = "/bar/foo"
      shouldUseLaunchSchemeArgsEnv = "YES"
      disableMainThreadChecker = "YES"
      language = "en"
      region = "GB"
      localizableStringsDataGatheringEnabled = "YES">
      <Testables>
      </Testables>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      customLLDBInitFile = "/foo/bar"
      disableMainThreadChecker = "YES"
      disablePerformanceAntipatternChecker = "YES"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "FB9BD24F2872C2BB00F272D3"
            BuildableName = "AppWithExts.app"
            BlueprintName = "AppWithExts"
            ReferencedContainer = "container:AppWithExts.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </LaunchAction>
```
---
 .../XcodeProj/Extensions/AEXML+XcodeFormat.swift  |  5 ++++-
 .../Extensions/AEXML+XcodeFormatTests.swift       | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Sources/XcodeProj/Extensions/AEXML+XcodeFormat.swift b/Sources/XcodeProj/Extensions/AEXML+XcodeFormat.swift
index 6ac2cbc08..88bd5e84b 100644
--- a/Sources/XcodeProj/Extensions/AEXML+XcodeFormat.swift
+++ b/Sources/XcodeProj/Extensions/AEXML+XcodeFormat.swift
@@ -35,16 +35,19 @@ let attributesOrder: [String: [String]] = [
         "selectedLauncherIdentifier",
         "customLLDBInitFile",
         "language",
+        "shouldUseLaunchSchemeArgsEnv",
+        "disableMainThreadChecker",
         "region",
         "codeCoverageEnabled",
         "onlyGenerateCoverageForSpecifiedTargets",
-        "shouldUseLaunchSchemeArgsEnv",
     ],
     "LaunchAction": [
         "buildConfiguration",
         "selectedDebuggerIdentifier",
         "selectedLauncherIdentifier",
         "customLLDBInitFile",
+        "disableMainThreadChecker",
+        "disablePerformanceAntipatternChecker",
         "language",
         "region",
         "launchStyle",
diff --git a/Tests/XcodeProjTests/Extensions/AEXML+XcodeFormatTests.swift b/Tests/XcodeProjTests/Extensions/AEXML+XcodeFormatTests.swift
index c7abde562..1df78b7d4 100644
--- a/Tests/XcodeProjTests/Extensions/AEXML+XcodeFormatTests.swift
+++ b/Tests/XcodeProjTests/Extensions/AEXML+XcodeFormatTests.swift
@@ -27,6 +27,8 @@ class AEXML_XcodeFormatTests: XCTestCase {
            buildConfiguration = "Debug"
            selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
            customLLDBInitFile = "$(BAZEL_LLDB_INIT)"
+           disableMainThreadChecker = "YES"
+           disablePerformanceAntipatternChecker = "YES"
            launchStyle = "0"
            allowLocationSimulation = "YES">
         </LaunchAction>
@@ -39,7 +41,8 @@ class AEXML_XcodeFormatTests: XCTestCase {
            buildConfiguration = "Debug"
            selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
            customLLDBInitFile = "$(BAZEL_LLDB_INIT)"
-           shouldUseLaunchSchemeArgsEnv = "YES">
+           shouldUseLaunchSchemeArgsEnv = "YES"
+           disableMainThreadChecker = "YES">
         </TestAction>
         """
 
@@ -76,7 +79,9 @@ class AEXML_XcodeFormatTests: XCTestCase {
                 "selectedLauncherIdentifier": "Xcode.DebuggerFoundation.Launcher.LLDB",
                 "customLLDBInitFile": "$(BAZEL_LLDB_INIT)",
                 "launchStyle": "0",
-                "allowLocationSimulation": "YES"
+                "allowLocationSimulation": "YES",
+                "disableMainThreadChecker": "YES",
+                "disablePerformanceAntipatternChecker": "YES",
             ]
         )
     }
@@ -86,6 +91,8 @@ class AEXML_XcodeFormatTests: XCTestCase {
             expectedXML: expectedLaunchActionXml.cleaned,
             childName: "LaunchAction",
             attributes: [
+                "disableMainThreadChecker": "YES",
+                "disablePerformanceAntipatternChecker": "YES",
                 "customLLDBInitFile": "$(BAZEL_LLDB_INIT)",
                 "allowLocationSimulation": "YES",
                 "buildConfiguration": "Debug",
@@ -103,7 +110,8 @@ class AEXML_XcodeFormatTests: XCTestCase {
                 "buildConfiguration": "Debug",
                 "customLLDBInitFile": "$(BAZEL_LLDB_INIT)",
                 "selectedLauncherIdentifier": "Xcode.DebuggerFoundation.Launcher.LLDB",
-                "shouldUseLaunchSchemeArgsEnv": "YES"
+                "shouldUseLaunchSchemeArgsEnv": "YES",
+                "disableMainThreadChecker": "YES",
             ]
         )
     }
@@ -113,6 +121,7 @@ class AEXML_XcodeFormatTests: XCTestCase {
             expectedXML: expectedTestActionXml.cleaned,
             childName: "TestAction",
             attributes: [
+                "disableMainThreadChecker": "YES",
                 "shouldUseLaunchSchemeArgsEnv": "YES",
                 "buildConfiguration": "Debug",
                 "customLLDBInitFile": "$(BAZEL_LLDB_INIT)",