Alphabetize flag everywhere

Author: sebastianv1

test/internal/pbxproj_partials/write_pbxproj_prefix_tests.bzl

@@ -48,7 +48,6 @@ def _write_pbxproj_prefix_test_impl(ctx):
         colorize = ctx.attr.colorize,
         config = ctx.attr.config,
         default_xcode_configuration = ctx.attr.default_xcode_configuration,
-        suppress_coverage_build = ctx.attr.suppress_coverage_build,
         execution_root_file = ctx.attr.execution_root_file,
         generator_name = "a_generator_name",
         import_index_build_indexstores = (
@@ -64,6 +63,7 @@ def _write_pbxproj_prefix_test_impl(ctx):
         project_options = ctx.attr.project_options,
         resolved_repositories_file = ctx.attr.resolved_repositories_file,
         separate_index_build_output_base = ctx.attr.separate_index_build_output_base,
+        suppress_coverage_build = ctx.attr.suppress_coverage_build,
         target_ids_list = ctx.attr.target_ids_list,
         tool = None,
         workspace_directory = ctx.attr.workspace_directory,
@@ -154,9 +154,9 @@ write_pbxproj_prefix_test = unittest.make(
         "post_build_script": attr.string(),
         "pre_build_script": attr.string(),
         "project_options": attr.string_dict(mandatory = True),
-        "suppress_coverage_build": attr.bool(mandatory = True),
         "resolved_repositories_file": attr.string(mandatory = True),
         "separate_index_build_output_base": attr.bool(mandatory = True),
+        "suppress_coverage_build": attr.bool(mandatory = True),
         "target_ids_list": attr.string(mandatory = True),
         "workspace_directory": attr.string(mandatory = True),
         "xcode_configurations": attr.string_list(mandatory = True),
@@ -184,7 +184,6 @@ def write_pbxproj_prefix_test_suite(name):
             colorize = False,
             config,
             default_xcode_configuration,
-            suppress_coverage_build = False,
             execution_root_file,
             import_index_build_indexstores,
             index_import,
@@ -196,6 +195,7 @@ def write_pbxproj_prefix_test_suite(name):
             project_options,
             resolved_repositories_file,
             separate_index_build_output_base = False,
+            suppress_coverage_build = False,
             target_ids_list,
             workspace_directory,
             xcode_configurations,
@@ -211,7 +211,6 @@ def write_pbxproj_prefix_test_suite(name):
             colorize = colorize,
             config = config,
             default_xcode_configuration = default_xcode_configuration,
-            suppress_coverage_build = suppress_coverage_build,
             execution_root_file = execution_root_file,
             import_index_build_indexstores = import_index_build_indexstores,
             index_import = index_import,
@@ -223,6 +222,7 @@ def write_pbxproj_prefix_test_suite(name):
             project_options = project_options,
             resolved_repositories_file = resolved_repositories_file,
             separate_index_build_output_base = separate_index_build_output_base,
+            suppress_coverage_build = suppress_coverage_build,
             target_ids_list = target_ids_list,
             workspace_directory = workspace_directory,
             xcode_configurations = xcode_configurations,

tools/generators/pbxproj_prefix/src/Generator/Environment.swift

@@ -31,12 +31,12 @@ extension Generator {
 
         let pbxProjectBuildSettings: (
             _ config: String,
-            _ suppressCoverageBuild: Bool,
             _ importIndexBuildIndexstores: Bool,
             _ legacyIndexImport: String,
             _ indexImport: String,
             _ indexingProjectDir: String,
             _ separateIndexBuildOutputBase: Bool,
+            _ suppressCoverageBuild: Bool,
             _ projectDir: String,
             _ resolvedRepositories: String,
             _ workspace: String,

tools/generators/pbxproj_prefix/src/Generator/Generator.swift

@@ -49,7 +49,6 @@ struct Generator {
         let pbxProjectPrefixPartial = environment.pbxProjectPrefixPartial(
             /*buildSettings:*/ environment.pbxProjectBuildSettings(
                 /*config:*/ arguments.config,
-                /*suppressCoverageBuild:*/ arguments.suppressCoverageBuild,
                 /*importIndexBuildIndexstores:*/ arguments
                     .importIndexBuildIndexstores,
                 /*legacyIndexImport:*/ arguments.legacyIndexImport,
@@ -58,6 +57,7 @@ struct Generator {
                     /*projectDir:*/ projectDir
                 ),
                 /*separateIndexBuildOutputBase:*/ arguments.separateIndexBuildOutputBase,
+                /*suppressCoverageBuild:*/ arguments.suppressCoverageBuild,
                 /*projectDir:*/ projectDir,
                 /*resolvedRepositories:*/
                     try environment.readResolvedRepositoriesFile(

tools/generators/pbxproj_prefix/src/Generator/PBXProjectBuildSettings.swift

@@ -21,12 +21,12 @@ extension Generator {
     ///   - workspace: The absolute path to the Bazel workspace.
     static func pbxProjectBuildSettings(
         config: String,
-        suppressCoverageBuild: Bool,
         importIndexBuildIndexstores: Bool,
         legacyIndexImport: String,
         indexImport: String,
         indexingProjectDir: String,
         separateIndexBuildOutputBase: Bool,
+        suppressCoverageBuild: Bool,
         projectDir: String,
         resolvedRepositories: String,
         workspace: String,

tools/generators/pbxproj_prefix/test/PBXProjectBuildSettingsTests.swift

@@ -87,12 +87,12 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 
         let buildSettings = Generator.pbxProjectBuildSettings(
             config: config,
-            suppressCoverageBuild: false,
             importIndexBuildIndexstores: importIndexBuildIndexstores,
             legacyIndexImport: legacyIndexImport,
             indexImport: indexImport,
             indexingProjectDir: indexingProjectDir,
             separateIndexBuildOutputBase: false,
+            suppressCoverageBuild: false,
             projectDir: projectDir,
             resolvedRepositories: resolvedRepositories,
             workspace: workspace,
@@ -178,12 +178,12 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 
         let buildSettings = Generator.pbxProjectBuildSettings(
             config: config,
-            suppressCoverageBuild: true,
             importIndexBuildIndexstores: importIndexBuildIndexstores,
             legacyIndexImport: legacyIndexImport,
             indexImport: indexImport,
             indexingProjectDir: indexingProjectDir,
             separateIndexBuildOutputBase: false,
+            suppressCoverageBuild: true,
             projectDir: projectDir,
             resolvedRepositories: resolvedRepositories,
             workspace: workspace,

xcodeproj/internal/pbxproj_partials.bzl

@@ -659,7 +659,6 @@ def _write_pbxproj_prefix(
         colorize,
         config,
         default_xcode_configuration,
-        suppress_coverage_build,
         execution_root_file,
         generator_name,
         import_index_build_indexstores,
@@ -673,6 +672,7 @@ def _write_pbxproj_prefix(
         project_options,
         resolved_repositories_file,
         separate_index_build_output_base,
+        suppress_coverage_build,
         target_ids_list,
         tool,
         workspace_directory,
@@ -686,8 +686,6 @@ def _write_pbxproj_prefix(
         config: The name of the `.bazelrc` config.
         default_xcode_configuration: The name of the the Xcode configuration to
             use when building, if not overridden by custom schemes.
-        suppress_coverage_build: Whether or not to disable coverage builds even
-            when `CLANG_COVERAGE_MAPPING` is set.
         execution_root_file: A `File` containing the absolute path to the Bazel
             execution root.
         generator_name: The name of the `xcodeproj` generator target.
@@ -708,6 +706,8 @@ def _write_pbxproj_prefix(
             the `RESOLVED_REPOSITORIES` build setting.
         separate_index_build_output_base: Whether or not to use a separate
             output base for index builds.
+        suppress_coverage_build: Whether or not to disable coverage builds even
+            when `CLANG_COVERAGE_MAPPING` is set.
         target_ids_list: A `File` containing a list of target IDs.
         tool: The executable that will generate the `PBXProj` partial.
         workspace_directory: The absolute path to the Bazel workspace

xcodeproj/internal/templates/generator.BUILD.bazel

@@ -31,9 +31,9 @@ xcodeproj(
     runner_label = "%runner_label%",
     scheme_autogeneration_mode = "%scheme_autogeneration_mode%",
     scheme_autogeneration_config = %scheme_autogeneration_config%,
-    suppress_coverage_build = %suppress_coverage_build%,
     separate_index_build_output_base = %separate_index_build_output_base%,
     storekit_configurations_map = %storekit_configurations_map%,
+    suppress_coverage_build = %suppress_coverage_build%,
     tags = %tags%,
     target_name_mode = "%target_name_mode%",
     top_level_device_targets = %top_level_device_targets%,

xcodeproj/internal/xcodeproj_rule.bzl

@@ -342,10 +342,10 @@ def _write_project_contents(
         post_build_script,
         pre_build_script,
         project_options,
-        suppress_coverage_build,
         resource_bundle_xcode_targets,
         selected_model_versions_generator,
         separate_index_build_output_base,
+        suppress_coverage_build,
         target_name_mode,
         unique_directories,
         unowned_extra_files,
@@ -464,8 +464,8 @@ def _write_project_contents(
         pre_build_script = pre_build_script,
         project_options = project_options,
         resolved_repositories_file = resolved_repositories_file,
-        suppress_coverage_build = suppress_coverage_build,
         separate_index_build_output_base = separate_index_build_output_base,
+        suppress_coverage_build = suppress_coverage_build,
         target_ids_list = target_ids_list,
         tool = pbxproj_prefix_generator,
         xcode_configurations = xcode_configurations,
@@ -637,8 +637,8 @@ Are you using an `alias`? `xcodeproj.focused_targets` and \
     legacy_index_import = ctx.executable._legacy_index_import
     index_import = ctx.executable._index_import
     install_path = ctx.attr.install_path
-    suppress_coverage_build = ctx.attr.suppress_coverage_build
     separate_index_build_output_base = ctx.attr.separate_index_build_output_base
+    suppress_coverage_build = ctx.attr.suppress_coverage_build
     name = ctx.attr.name
     workspace_directory = ctx.attr.workspace_directory
 
@@ -703,11 +703,11 @@ Are you using an `alias`? `xcodeproj.focused_targets` and \
                 ).to_list(),
             )
         ),
-        suppress_coverage_build = suppress_coverage_build,
         selected_model_versions_generator = (
             ctx.executable._selected_model_versions_generator
         ),
         separate_index_build_output_base = separate_index_build_output_base,
+        suppress_coverage_build = suppress_coverage_build,
         target_name_mode = ctx.attr.target_name_mode,
         unique_directories = ctx.executable._unique_directories,
         unowned_extra_files = ctx.files.unowned_extra_files,