Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ordering of diagnostics scheme options #704

Merged
merged 1 commit into from
Jul 14, 2022

Conversation

kwridan
Copy link
Collaborator

@kwridan kwridan commented Jul 7, 2022

Short description 📝

  • The ordering for the runtime checker (main thread, thread performance) were incorrect

Solution 📦

  • Add explicit ordering for the diagnostics options

Test Plan 🛠

Test Plan:

  • Verify order matches that created by Xcode

e.g.

<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>

Copy link
Member

@fortmarek fortmarek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, once the merge conflicts are resolved ✅

- 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>
```
@kwridan kwridan force-pushed the fix/scheme-diagnostics-options-order branch from 11dccd0 to 7d70e89 Compare July 14, 2022 06:44
@codecov-commenter
Copy link

codecov-commenter commented Jul 14, 2022

Codecov Report

Merging #704 (7d70e89) into main (490057a) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main     #704   +/-   ##
=======================================
  Coverage   84.79%   84.80%           
=======================================
  Files         157      157           
  Lines        9173     9179    +6     
=======================================
+ Hits         7778     7784    +6     
  Misses       1395     1395           
Impacted Files Coverage Δ
...urces/XcodeProj/Extensions/AEXML+XcodeFormat.swift 92.45% <ø> (ø)
...eProjTests/Extensions/AEXML+XcodeFormatTests.swift 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 490057a...7d70e89. Read the comment docs.

@kwridan kwridan merged commit 099c64c into main Jul 14, 2022
@kwridan kwridan deleted the fix/scheme-diagnostics-options-order branch July 14, 2022 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants