dnrops
/
SwiftLint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update SwiftSyntax (#4673) 

* Exclude `Documentation.docc` when building SwiftSyntax
* Remove references to `.stringInterpolationAnchor`

Co-authored-by: JP Simard <jp@jpsim.com>
This commit is contained in:
github-actions[bot] 2023-01-06 11:12:17 -05:00 committed by GitHub
parent 68dc0f58d2
commit bcfc2c4b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Package.resolved
View File

@ -32,7 +32,7 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git", "location" : "https://github.com/apple/swift-syntax.git",
"state" : { "state" : {
"revision" : "a2d31e8880224f5a619f24bf58c122836faf99ff" "revision" : "60e2097fa967e3bd0a2c3f08b1c672865c1f1d60"
} }
}, },
{ {

2
Package.swift
View File

@ -30,7 +30,7 @@ let package = Package(
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.0")), .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.0")),
.package(url: "https://github.com/apple/swift-syntax.git", revision: "a2d31e8880224f5a619f24bf58c122836faf99ff"), .package(url: "https://github.com/apple/swift-syntax.git", revision: "60e2097fa967e3bd0a2c3f08b1c672865c1f1d60"),
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.33.1")), .package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.33.1")),
.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.1"), .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.1"),
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"), .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),

3
Source/SwiftLintFramework/Rules/Style/ClosureSpacingRule.swift
View File

@ -224,8 +224,7 @@ private extension TokenSyntax {
.postfixQuestionMark, .postfixQuestionMark,
.rightParen, .rightParen,
.rightSquareBracket, .rightSquareBracket,
.semicolon, .semicolon
.stringInterpolationAnchor
] ]
if case .newlines = trailingTrivia.first { if case .newlines = trailingTrivia.first {
return true return true

5
bazel/SwiftSyntax.BUILD
View File

@ -11,7 +11,10 @@ cc_library(
swift_library( swift_library(
name = "SwiftSyntax", name = "SwiftSyntax",
srcs = glob(["Sources/SwiftSyntax/**/*.swift"]), srcs = glob(
["Sources/SwiftSyntax/**/*.swift"],
exclude = ["Sources/SwiftSyntax/Documentation.docc/**"],
),
module_name = "SwiftSyntax", module_name = "SwiftSyntax",
private_deps = ["_CSwiftSyntax"], private_deps = ["_CSwiftSyntax"],
) )

6
bazel/repos.bzl
View File

@ -19,10 +19,10 @@ def swiftlint_repos():
http_archive( http_archive(
name = "com_github_apple_swift_syntax", name = "com_github_apple_swift_syntax",
sha256 = "854c5cefdcfdb30fdc758db9cdad37fb9b78bb6897300e2ceb92f7be41bbe044", # SwiftSyntax sha256 sha256 = "18f910a68c06e7a11f813b781704bff2ef6ebd676ccc7506dc479fc95811a64f", # SwiftSyntax sha256
build_file = "@SwiftLint//bazel:SwiftSyntax.BUILD", build_file = "@SwiftLint//bazel:SwiftSyntax.BUILD",
strip_prefix = "swift-syntax-a2d31e8880224f5a619f24bf58c122836faf99ff", strip_prefix = "swift-syntax-60e2097fa967e3bd0a2c3f08b1c672865c1f1d60",
url = "https://github.com/apple/swift-syntax/archive/a2d31e8880224f5a619f24bf58c122836faf99ff.tar.gz", url = "https://github.com/apple/swift-syntax/archive/60e2097fa967e3bd0a2c3f08b1c672865c1f1d60.tar.gz",
) )
http_archive( http_archive(