Skip to content

Fix missing imports when enabling MemberImportVisibility #3302

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.

Sign up for GitHub

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

Open
bkolb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix missing imports when enabling MemberImportVisibility #3302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,14 @@ package.targets.append(
)
)

// MARK: - Apply upcoming feature flags to all targets

for target in package.targets {
Comment thread
bkolb marked this conversation as resolved.
var settings = target.swiftSettings ?? []
settings.append(.enableUpcomingFeature("MemberImportVisibility"))
target.swiftSettings = settings
}

// MARK: - Parse build arguments

func hasEnvironmentVariable(_ name: String) -> Bool {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftCompilerPluginMessageHandling/Diagnostics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
#if compiler(>=6)
internal import SwiftDiagnostics
internal import SwiftSyntax
internal import SwiftSyntaxMacros
#else
import SwiftDiagnostics
import SwiftSyntax
import SwiftSyntaxMacros
#endif

/// Errors in macro handing.
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftIfConfig/IfConfigEvaluation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import SwiftDiagnostics
import SwiftOperators
@_spi(RawSyntax) import SwiftSyntax
import SwiftSyntaxBuilder

/// Evaluate the condition of an `#if`.
/// - Parameters:
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
//===----------------------------------------------------------------------===//

#if compiler(>=6)
internal import SwiftBasicFormat
public import SwiftDiagnostics
@_spi(Diagnostics) internal import SwiftParser
@_spi(ExperimentalLanguageFeatures) public import SwiftSyntax
#else
import SwiftBasicFormat
import SwiftDiagnostics
@_spi(Diagnostics) import SwiftParser
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftRefactor/ConvertComputedPropertyToStored.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

#if compiler(>=6)
public import SwiftSyntax
public import SwiftSyntaxBuilder
#else
import SwiftSyntax
import SwiftSyntaxBuilder
#endif

public struct ConvertComputedPropertyToStored: SyntaxRefactoringProvider {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftRefactor/ConvertStoredPropertyToComputed.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

#if compiler(>=6)
public import SwiftSyntax
public import SwiftSyntaxBuilder
#else
import SwiftSyntax
import SwiftSyntaxBuilder
#endif

public struct ConvertStoredPropertyToComputed: SyntaxRefactoringProvider {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftRefactor/ConvertZeroParameterFunctionToComputedProperty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
#if compiler(>=6)
public import SwiftSyntax
import SwiftBasicFormat
import SwiftSyntaxBuilder
#else
import SwiftSyntax
import SwiftBasicFormat
import SwiftSyntaxBuilder
#endif

public struct ConvertZeroParameterFunctionToComputedProperty: SyntaxRefactoringProvider {
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRefactor/PackageManifest/ManifestSyntaxRepresentable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//

import SwiftSyntax
import SwiftSyntaxBuilder

/// Describes an entity in the package model that can be represented as
/// a syntax node.
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRefactor/PackageManifest/PackageTarget.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//

import SwiftSyntax
import SwiftSyntaxBuilder

/// Syntactic wrapper type that describes a target for refactoring
/// purposes but does not interpret its contents.
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRefactor/PackageManifest/ProductDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//

import SwiftSyntax
import SwiftSyntaxBuilder

/// Syntactic wrapper type that describes a product for refactoring
/// purposes but does not interpret its contents.
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftRefactor/PackageManifest/SyntaxEditUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import SwiftBasicFormat
import SwiftParser
import SwiftSyntax
import SwiftSyntaxBuilder

/// Default indent when we have to introduce indentation but have no context
/// to get it right.
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftSyntaxMacroExpansion/IndentationUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
//===----------------------------------------------------------------------===//

#if compiler(>=6)
internal import SwiftBasicFormat
internal import SwiftSyntax
#else
import SwiftBasicFormat
import SwiftSyntax
#endif

Expand Down
6 changes: 3 additions & 3 deletions Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
//===----------------------------------------------------------------------===//

#if compiler(>=6)
import SwiftBasicFormat
import SwiftDiagnostics
import SwiftIfConfig
internal import SwiftBasicFormat
internal import SwiftDiagnostics
internal import SwiftIfConfig
public import SwiftSyntax
@_spi(MacroExpansion) @_spi(ExperimentalLanguageFeatures) public import SwiftSyntaxMacros
#else
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftSyntaxMacroExpansion/MacroSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@

#if compiler(>=6)
public import SwiftSyntax
internal import SwiftSyntaxBuilder
public import SwiftSyntaxMacros
#else
import SwiftSyntax
import SwiftSyntaxBuilder
import SwiftSyntaxMacros
#endif

Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
//===----------------------------------------------------------------------===//

#if compiler(>=6)
internal import SwiftBasicFormat
internal import SwiftDiagnostics
internal import SwiftOperators
@_spi(MacroExpansion) internal import SwiftParser
@_spi(RawSyntax) public import SwiftSyntax
internal import SwiftSyntaxBuilder
@_spi(MacroExpansion) @_spi(ExperimentalLanguageFeatures) public import SwiftSyntaxMacros
#else
import SwiftBasicFormat
import SwiftDiagnostics
import SwiftOperators
@_spi(MacroExpansion) import SwiftParser
Expand Down
Loading