Rename IfConfigState -> ConfiguredRegionState

The new name better describes that we're talking about regions that
have to do with the build configuration.

Author: DougGregor

Package.swift

@@ -17,11 +17,8 @@ let package = Package(
     .library(name: "SwiftCompilerPlugin", targets: ["SwiftCompilerPlugin"]),
     .library(name: "SwiftDiagnostics", targets: ["SwiftDiagnostics"]),
     .library(name: "SwiftIDEUtils", targets: ["SwiftIDEUtils"]),
-<<<<<<< HEAD
-    .library(name: "SwiftLexicalLookup", targets: ["SwiftLexicalLookup"]),
-=======
     .library(name: "SwiftIfConfig", targets: ["SwiftIfConfig"]),
->>>>>>> d8c920b49 ([SwiftIfConfig] Add a new library for evaluating `#if` conditions.)
+    .library(name: "SwiftLexicalLookup", targets: ["SwiftLexicalLookup"]),
     .library(name: "SwiftOperators", targets: ["SwiftOperators"]),
     .library(name: "SwiftParser", targets: ["SwiftParser"]),
     .library(name: "SwiftParserDiagnostics", targets: ["SwiftParserDiagnostics"]),

Sources/SwiftIfConfig/CMakeLists.txt

@@ -9,11 +9,11 @@
 add_swift_syntax_library(SwiftIfConfig
   BuildConfiguration.swift
   ConfiguredRegions.swift
+  ConfiguredRegionState.swift
   IfConfigError.swift
   IfConfigEvaluation.swift
   IfConfigFunctions.swift
   IfConfigRewriter.swift
-  IfConfigState.swift
   IfConfigVisitor.swift
   SyntaxLiteralUtils.swift
   VersionTuple+Parsing.swift

Sources/SwiftIfConfig/IfConfigState.swift …wiftIfConfig/ConfiguredRegionState.swiftSources/SwiftIfConfig/IfConfigState.swift renamed to Sources/SwiftIfConfig/ConfiguredRegionState.swift Sources/SwiftIfConfig/IfConfigState.swift renamed to Sources/SwiftIfConfig/ConfiguredRegionState.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 /// Describes the state of a particular region guarded by `#if` or similar.
-public enum IfConfigState {
+public enum ConfiguredRegionState {
   /// The region is not part of the compiled program and is not even parsed,
   /// and therefore many contain syntax that is invalid.
   case unparsed

Sources/SwiftIfConfig/ConfiguredRegions.swift

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

Sources/SwiftIfConfig/IfConfigEvaluation.swift

@@ -406,7 +406,7 @@ private func evaluateIfConfig(
   throw recordedError(.unknownExpression(condition))
 }
 
-extension IfConfigState {
+extension ConfiguredRegionState {
   /// Evaluate the given `#if` condition using the given build configuration, throwing an error if there is
   /// insufficient information to make a determination.
   public init(
@@ -496,9 +496,9 @@ extension SyntaxProtocol {
   public func isActive(
     in configuration: some BuildConfiguration,
     diagnosticHandler: ((Diagnostic) -> Void)? = nil
-  ) throws -> IfConfigState {
+  ) throws -> ConfiguredRegionState {
     var currentNode: Syntax = Syntax(self)
-    var currentState: IfConfigState = .active
+    var currentState: ConfiguredRegionState = .active
 
     while let parent = currentNode.parent {
       // If the parent is an `#if` configuration, check whether our current
@@ -539,9 +539,9 @@ extension SyntaxProtocol {
   /// This is
   /// an approximation
   public func isActive(
-    inConfiguredRegions regions: [(IfConfigClauseSyntax, IfConfigState)]
-  ) -> IfConfigState {
-    var currentState: IfConfigState = .active
+    inConfiguredRegions regions: [(IfConfigClauseSyntax, ConfiguredRegionState)]
+  ) -> ConfiguredRegionState {
+    var currentState: ConfiguredRegionState = .active
     for (ifClause, state) in regions {
       if self.position < ifClause.position {
         return currentState

Tests/SwiftIfConfigTest/Assertions.swift

@@ -22,7 +22,7 @@ import _SwiftSyntaxTestSupport
 /// given build configuration.
 func assertIfConfig(
   _ condition: ExprSyntax,
-  _ expectedState: IfConfigState?,
+  _ expectedState: ConfiguredRegionState?,
   configuration: some BuildConfiguration = TestingBuildConfiguration(),
   diagnostics expectedDiagnostics: [DiagnosticSpec] = [],
   file: StaticString = #filePath,
@@ -31,7 +31,7 @@ func assertIfConfig(
   // Evaluate the condition to check the state.
   var actualDiagnostics: [Diagnostic] = []
   do {
-    let actualState = try IfConfigState(condition: condition, configuration: configuration) { diag in
+    let actualState = try ConfiguredRegionState(condition: condition, configuration: configuration) { diag in
       actualDiagnostics.append(diag)
     }
     XCTAssertEqual(actualState, expectedState, file: file, line: line)
@@ -68,7 +68,7 @@ func assertIfConfig(
 func assertActiveCode(
   _ markedSource: String,
   configuration: some BuildConfiguration = TestingBuildConfiguration(),
-  states: [String: IfConfigState],
+  states: [String: ConfiguredRegionState],
   file: StaticString = #filePath,
   line: UInt = #line
 ) throws {

Tests/SwiftIfConfigTest/VisitorTests.swift

@@ -25,7 +25,7 @@ class AllActiveVisitor: ActiveSyntaxAnyVisitor<TestingBuildConfiguration> {
     super.init(viewMode: .sourceAccurate, configuration: configuration)
   }
   open override func visitAny(_ node: Syntax) -> SyntaxVisitorContinueKind {
-    var active: IfConfigState = .inactive
+    var active: ConfiguredRegionState = .inactive
     XCTAssertNoThrow(try active = node.isActive(in: configuration))
     XCTAssertEqual(active, .active)
     return .visitChildren