Renamed ConfiguredRegionState -> IfConfigRegionState

Author: DougGregor

Sources/SwiftIfConfig/CMakeLists.txt

@@ -11,7 +11,7 @@ add_swift_syntax_library(SwiftIfConfig
   ActiveSyntaxRewriter.swift
   BuildConfiguration.swift
   ConfiguredRegions.swift
-  ConfiguredRegionState.swift
+  IfConfigRegionState.swift
   IfConfigDecl+IfConfig.swift
   IfConfigError.swift
   IfConfigEvaluation.swift

Sources/SwiftIfConfig/ConfiguredRegions.swift

@@ -38,7 +38,7 @@ extension SyntaxProtocol {
   ///   - Inactive region for the final `#else`.
   public func configuredRegions(
     in configuration: some BuildConfiguration
-  ) -> [(IfConfigClauseSyntax, ConfiguredRegionState)] {
+  ) -> [(IfConfigClauseSyntax, IfConfigRegionState)] {
     let visitor = ConfiguredRegionVisitor(configuration: configuration)
     visitor.walk(self)
     return visitor.regions
@@ -50,7 +50,7 @@ fileprivate class ConfiguredRegionVisitor<Configuration: BuildConfiguration>: Sy
   let configuration: Configuration
 
   /// The regions we've found so far.
-  var regions: [(IfConfigClauseSyntax, ConfiguredRegionState)] = []
+  var regions: [(IfConfigClauseSyntax, IfConfigRegionState)] = []
 
   /// Whether we are currently within an active region.
   var inActiveRegion = true

Sources/SwiftIfConfig/ConfiguredRegionState.swift renamed to Sources/SwiftIfConfig/IfConfigRegionState.swift

@@ -15,7 +15,7 @@ import SwiftOperators
 import SwiftSyntax
 
 /// Describes the state of a particular region guarded by `#if` or similar.
-public enum ConfiguredRegionState {
+public enum IfConfigRegionState {
   /// The region is not part of the compiled program and is not even parsed,
   /// and therefore many contain syntax that is invalid.
   case unparsed
@@ -30,7 +30,7 @@ public enum ConfiguredRegionState {
   public static func evaluating(
     _ condition: some ExprSyntaxProtocol,
     in configuration: some BuildConfiguration
-  ) -> (state: ConfiguredRegionState, diagnostics: [Diagnostic]) {
+  ) -> (state: IfConfigRegionState, diagnostics: [Diagnostic]) {
     // Apply operator folding for !/&&/||.
     var foldingDiagnostics: [Diagnostic] = []
     let foldedCondition = OperatorTable.logicalOperators.foldAll(condition) { error in

Sources/SwiftIfConfig/SyntaxProtocol+IfConfig.swift

@@ -32,9 +32,9 @@ extension SyntaxProtocol {
   /// configuration options `DEBUG` and `B` are provided, but `A` is not.
   public func isActive(
     in configuration: some BuildConfiguration
-  ) -> (state: ConfiguredRegionState, diagnostics: [Diagnostic])  {
+  ) -> (state: IfConfigRegionState, diagnostics: [Diagnostic])  {
     var currentNode: Syntax = Syntax(self)
-    var currentState: ConfiguredRegionState = .active
+    var currentState: IfConfigRegionState = .active
     var diagnostics: [Diagnostic] = []
 
     while let parent = currentNode.parent {
@@ -76,9 +76,9 @@ extension SyntaxProtocol {
   /// This is
   /// an approximation
   public func isActive(
-    inConfiguredRegions regions: [(IfConfigClauseSyntax, ConfiguredRegionState)]
-  ) -> ConfiguredRegionState {
-    var currentState: ConfiguredRegionState = .active
+    inConfiguredRegions regions: [(IfConfigClauseSyntax, IfConfigRegionState)]
+  ) -> IfConfigRegionState {
+    var currentState: IfConfigRegionState = .active
     for (ifClause, state) in regions {
       if self.position < ifClause.position {
         return currentState

Tests/SwiftIfConfigTest/Assertions.swift

@@ -23,16 +23,16 @@ import _SwiftSyntaxTestSupport
 /// given build configuration.
 func assertIfConfig(
   _ condition: ExprSyntax,
-  _ expectedState: ConfiguredRegionState,
+  _ expectedState: IfConfigRegionState,
   configuration: some BuildConfiguration = TestingBuildConfiguration(),
   diagnostics expectedDiagnostics: [DiagnosticSpec] = [],
   file: StaticString = #filePath,
   line: UInt = #line
 ) {
   // Evaluate the condition to check the state.
   let actualDiagnostics: [Diagnostic]
-  let actualState: ConfiguredRegionState
-    (actualState, actualDiagnostics) = ConfiguredRegionState.evaluating (condition, in: configuration)
+  let actualState: IfConfigRegionState
+    (actualState, actualDiagnostics) = IfConfigRegionState.evaluating (condition, in: configuration)
   XCTAssertEqual(actualState, expectedState, file: file, line: line)
 
   // Check the diagnostics.
@@ -64,7 +64,7 @@ func assertIfConfig(
 func assertActiveCode(
   _ markedSource: String,
   configuration: some BuildConfiguration = TestingBuildConfiguration(),
-  states: [String: ConfiguredRegionState],
+  states: [String: IfConfigRegionState],
   file: StaticString = #filePath,
   line: UInt = #line
 ) throws {