Skip to content

Commit 3695588

Browse files
committed
Fix missing imports when enabling MemberImportVisibility
Add missing imports when compiling with `.enableUpcomingFeature("MemberImportVisibility")` Issue: #3301
1 parent e9b5143 commit 3695588

15 files changed

Lines changed: 32 additions & 3 deletions

Package.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,14 @@ package.targets.append(
457457
)
458458
)
459459

460+
// MARK: - Apply upcoming feature flags to all targets
461+
462+
for target in package.targets {
463+
var settings = target.swiftSettings ?? []
464+
settings.append(.enableUpcomingFeature("MemberImportVisibility"))
465+
target.swiftSettings = settings
466+
}
467+
460468
// MARK: - Parse build arguments
461469

462470
func hasEnvironmentVariable(_ name: String) -> Bool {

Sources/SwiftCompilerPluginMessageHandling/Diagnostics.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
#if compiler(>=6)
1414
internal import SwiftDiagnostics
1515
internal import SwiftSyntax
16+
internal import SwiftSyntaxMacros
1617
#else
1718
import SwiftDiagnostics
1819
import SwiftSyntax
20+
import SwiftSyntaxMacros
1921
#endif
2022

2123
/// Errors in macro handing.

Sources/SwiftIfConfig/IfConfigEvaluation.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import SwiftDiagnostics
1414
import SwiftOperators
1515
@_spi(RawSyntax) import SwiftSyntax
16+
import SwiftSyntaxBuilder
1617

1718
/// Evaluate the condition of an `#if`.
1819
/// - Parameters:

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#if compiler(>=6)
14+
internal import SwiftBasicFormat
1415
public import SwiftDiagnostics
1516
@_spi(Diagnostics) internal import SwiftParser
1617
@_spi(ExperimentalLanguageFeatures) public import SwiftSyntax
1718
#else
19+
import SwiftBasicFormat
1820
import SwiftDiagnostics
1921
@_spi(Diagnostics) import SwiftParser
2022
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax

Sources/SwiftRefactor/ConvertComputedPropertyToStored.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313
#if compiler(>=6)
1414
public import SwiftSyntax
15+
public import SwiftSyntaxBuilder
1516
#else
1617
import SwiftSyntax
18+
import SwiftSyntaxBuilder
1719
#endif
1820

1921
public struct ConvertComputedPropertyToStored: SyntaxRefactoringProvider {

Sources/SwiftRefactor/ConvertStoredPropertyToComputed.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313
#if compiler(>=6)
1414
public import SwiftSyntax
15+
public import SwiftSyntaxBuilder
1516
#else
1617
import SwiftSyntax
18+
import SwiftSyntaxBuilder
1719
#endif
1820

1921
public struct ConvertStoredPropertyToComputed: SyntaxRefactoringProvider {

Sources/SwiftRefactor/ConvertZeroParameterFunctionToComputedProperty.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
#if compiler(>=6)
1414
public import SwiftSyntax
1515
import SwiftBasicFormat
16+
import SwiftSyntaxBuilder
1617
#else
1718
import SwiftSyntax
1819
import SwiftBasicFormat
20+
import SwiftSyntaxBuilder
1921
#endif
2022

2123
public struct ConvertZeroParameterFunctionToComputedProperty: SyntaxRefactoringProvider {

Sources/SwiftRefactor/PackageManifest/ManifestSyntaxRepresentable.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SwiftSyntax
14+
import SwiftSyntaxBuilder
1415

1516
/// Describes an entity in the package model that can be represented as
1617
/// a syntax node.

Sources/SwiftRefactor/PackageManifest/PackageTarget.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SwiftSyntax
14+
import SwiftSyntaxBuilder
1415

1516
/// Syntactic wrapper type that describes a target for refactoring
1617
/// purposes but does not interpret its contents.

Sources/SwiftRefactor/PackageManifest/ProductDescription.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SwiftSyntax
14+
import SwiftSyntaxBuilder
1415

1516
/// Syntactic wrapper type that describes a product for refactoring
1617
/// purposes but does not interpret its contents.

0 commit comments

Comments
 (0)