Skip to content

Use access levels on imports when compiler(>=6) #2917

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

Merged
merged 1 commit into from
Dec 14, 2024
Merged

Use access levels on imports when compiler(>=6) #2917

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
2 changes: 1 addition & 1 deletion ...eneration/Sources/generate-swift-syntax/templates/swiftparser/IsLexerClassifiedFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let isLexerClassifiedFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...eration/Sources/generate-swift-syntax/templates/swiftparser/LayoutNodesParsableFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let layoutNodesParsableFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) public import SwiftSyntax
#else
@_spi(RawSyntax) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...neration/Sources/generate-swift-syntax/templates/swiftparser/ParserTokenSpecSetFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func tokenCaseMatch(
let parserTokenSpecSetFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) public import SwiftSyntax
#else
@_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...tion/Sources/generate-swift-syntax/templates/swiftparser/TokenSpecStaticMembersFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let tokenSpecStaticMembersFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) internal import SwiftSyntax
#else
@_spi(RawSyntax) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion .../generate-swift-syntax/templates/swiftparserdiagnostics/ChildNameForDiagnosticsFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let childNameForDiagnosticFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(ExperimentalLanguageFeatures) internal import SwiftSyntax
#else
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...rate-swift-syntax/templates/swiftparserdiagnostics/SyntaxKindNameForDiagnosticsFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let syntaxKindNameForDiagnosticFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(ExperimentalLanguageFeatures) internal import SwiftSyntax
#else
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion .../generate-swift-syntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let tokenNameForDiagnosticFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) internal import SwiftSyntax
#else
@_spi(RawSyntax) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...ation/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let buildableNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(ExperimentalLanguageFeatures) public import SwiftSyntax
#else
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...e-swift-syntax/templates/swiftsyntaxbuilder/RenamedChildrenBuilderCompatibilityFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let renamedChildrenBuilderCompatibilityFile = try! SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...ation/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let resultBuildersFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
@_spi(ExperimentalLanguageFeatures) public import SwiftSyntax
#else
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion ...templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Utils
let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
DeclSyntax(
"""
#if swift(>=6)
#if compiler(>=6)
internal import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/BasicFormat.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) public import SwiftSyntax
#else
@_spi(RawSyntax) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/Indenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/InferIndentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/Syntax+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/SyntaxProtocol+Formatted.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftBasicFormat/Trivia+FormatExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftCompilerPlugin/CompilerPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6.0)
#if compiler(>=6)
public import SwiftSyntaxMacros
@_spi(PluginMessage) private import SwiftCompilerPluginMessageHandling
#else
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftCompilerPluginMessageHandling/CompilerPluginMessageHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
private import _SwiftSyntaxCShims
#if compiler(>=6)
@_implementationOnly private import _SwiftSyntaxCShims
public import SwiftSyntaxMacros
#else
@_implementationOnly import _SwiftSyntaxCShims
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftCompilerPluginMessageHandling/Diagnostics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
internal import SwiftDiagnostics
internal import SwiftSyntax
#else
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftCompilerPluginMessageHandling/JSON/JSONDecoding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6.0)
private import _SwiftSyntaxCShims
#if compiler(>=6)
@_implementationOnly private import _SwiftSyntaxCShims
#else
@_implementationOnly import _SwiftSyntaxCShims
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftCompilerPluginMessageHandling/Macros.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
internal import SwiftBasicFormat
internal import SwiftDiagnostics
internal import SwiftOperators
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
internal import SwiftDiagnostics
internal import SwiftOperators
internal import SwiftParser
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftCompilerPluginMessageHandling/StandardIOMessageConnection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6.0)
private import _SwiftSyntaxCShims
#if compiler(>=6)
@_implementationOnly private import _SwiftSyntaxCShims
#else
@_implementationOnly import _SwiftSyntaxCShims
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDiagnostics/Convenience.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDiagnostics/Diagnostic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDiagnostics/DiagnosticsFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDiagnostics/FixIt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDiagnostics/GroupedDiagnostics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDiagnostics/Note.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/DeclNameLocation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/FixItApplier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftDiagnostics
public import SwiftSyntax
#else
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/NameMatcher.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
import SwiftParser
public import SwiftSyntax
#else
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/Syntax+Classifications.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/SyntaxClassification.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) internal import SwiftSyntax
#else
@_spi(RawSyntax) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/SyntaxClassifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
@_spi(RawSyntax) public import SwiftSyntax
#else
@_spi(RawSyntax) import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftIDEUtils/Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
internal import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLibraryPluginProvider/LibraryPluginProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6.0)
#if compiler(>=6)
public import SwiftSyntaxMacros
@_spi(PluginMessage) public import SwiftCompilerPluginMessageHandling
private import _SwiftLibraryPluginProviderCShims
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftOperators/Operator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftOperators/OperatorError+Diagnostics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftDiagnostics
internal import SwiftParser
internal import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftOperators/OperatorError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftOperators/OperatorTable+Defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
internal import SwiftSyntax
#else
import SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftOperators/OperatorTable+Folding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#if swift(>=6)
#if compiler(>=6)
public import SwiftSyntax
#else
import SwiftSyntax
Expand Down
Loading