Skip to content

Commit

Permalink
Update SwiftSyntax (realm#4852)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimplyDanny authored Mar 31, 2023
1 parent 82491e6 commit 58a07eb
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"state" : {
"revision" : "013a48e2312e57b7b355db25bd3ea75282ebf274",
"version" : "0.50900.0-swift-DEVELOPMENT-SNAPSHOT-2023-02-06-a"
"revision" : "07c08da983b2815a0acc8e3a477573e4c663b158",
"version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-03-17-a"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.1")),
.package(url: "https://github.com/apple/swift-syntax.git", exact: "0.50900.0-swift-DEVELOPMENT-SNAPSHOT-2023-02-06-a"),
.package(url: "https://github.com/apple/swift-syntax.git", exact: "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-03-17-a"),
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.34.1")),
.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.5"),
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private extension ExplicitTopLevelACLRule {

override func visitPost(_ node: VariableDeclSyntax) {
if hasViolation(modifiers: node.modifiers) {
violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ extension LegacyHashingRule {
override func visitPost(_ node: VariableDeclSyntax) {
guard
node.parent?.is(MemberDeclListItemSyntax.self) == true,
node.letOrVarKeyword.tokenKind == .keyword(.var),
node.bindingKeyword.tokenKind == .keyword(.var),
let binding = node.bindings.onlyElement,
let identifier = binding.pattern.as(IdentifierPatternSyntax.self),
identifier.identifier.text == "hashValue",
Expand All @@ -95,7 +95,7 @@ extension LegacyHashingRule {
return
}

violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ private extension PatternMatchingKeywordsRule {
}

guard list.count > 1,
let firstLetOrVar = list.first?.letOrVarKeyword.tokenKind else {
let firstLetOrVar = list.first?.bindingKeyword.tokenKind else {
return
}

let hasViolation = list.allSatisfy { elem in
elem.letOrVarKeyword.tokenKind == firstLetOrVar
elem.bindingKeyword.tokenKind == firstLetOrVar
}

guard hasViolation else {
return
}

violations.append(contentsOf: list.compactMap { elem in
return elem.letOrVarKeyword.positionAfterSkippingLeadingTrivia
return elem.bindingKeyword.positionAfterSkippingLeadingTrivia
})
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ struct RedundantOptionalInitializationRule: SwiftSyntaxCorrectableRule, Configur
private extension RedundantOptionalInitializationRule {
final class Visitor: ViolationsSyntaxVisitor {
override func visitPost(_ node: VariableDeclSyntax) {
guard node.letOrVarKeyword.tokenKind == .keyword(.var),
guard node.bindingKeyword.tokenKind == .keyword(.var),
!node.modifiers.containsLazy else {
return
}
Expand All @@ -141,7 +141,7 @@ private extension RedundantOptionalInitializationRule {
}

override func visit(_ node: VariableDeclSyntax) -> DeclSyntax {
guard node.letOrVarKeyword.tokenKind == .keyword(.var),
guard node.bindingKeyword.tokenKind == .keyword(.var),
!node.modifiers.containsLazy else {
return super.visit(node)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct ShorthandOptionalBindingRule: OptInRule, SwiftSyntaxCorrectableRule, Conf
private class Visitor: ViolationsSyntaxVisitor {
override func visitPost(_ node: OptionalBindingConditionSyntax) {
if node.isShadowingOptionalBinding {
violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private extension OverrideInExtensionRule {

override func visitPost(_ node: VariableDeclSyntax) {
if node.modifiers.containsOverride {
violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword .positionAfterSkippingLeadingTrivia)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private extension PrivateOutletRule {
return
}

violations.append(decl.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(decl.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private extension ProhibitedInterfaceBuilderRule {
final class Visitor: ViolationsSyntaxVisitor {
override func visitPost(_ node: VariableDeclSyntax) {
if node.isIBOutlet {
violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private extension SelfInPropertyInitializationRule {
continue
}

violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private extension TestCaseAccessibilityRule {
continue
}

violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
return
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private extension ValidIBInspectableRule {

override func visitPost(_ node: VariableDeclSyntax) {
if node.isInstanceVariable, node.isIBInspectable, node.hasViolation {
violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}
}
Expand All @@ -178,7 +178,7 @@ private extension VariableDeclSyntax {
}

var isReadOnlyProperty: Bool {
if letOrVarKeyword.tokenKind == .keyword(.let) {
if bindingKeyword.tokenKind == .keyword(.let) {
return true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private extension WeakDelegateRule {
return
}

violations.append(node.letOrVarKeyword.positionAfterSkippingLeadingTrivia)
violations.append(node.bindingKeyword.positionAfterSkippingLeadingTrivia)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Rules/Style/AttributesRule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private extension AttributeListSyntax {
} else if let importTok = parent.as(ImportDeclSyntax.self)?.importTok {
keyword = importTok
shouldBeOnSameLine = true
} else if let letOrVarKeyword = parent.as(VariableDeclSyntax.self)?.letOrVarKeyword {
} else if let letOrVarKeyword = parent.as(VariableDeclSyntax.self)?.bindingKeyword {
keyword = letOrVarKeyword
shouldBeOnSameLine = true
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private extension PrefixedTopLevelConstantRule {
override var skippableDeclarations: [DeclSyntaxProtocol.Type] { .all }

override func visitPost(_ node: VariableDeclSyntax) {
guard node.letOrVarKeyword.tokenKind == .keyword(.let) else {
guard node.bindingKeyword.tokenKind == .keyword(.let) else {
return
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ private extension RedundantDiscardableLetRule {

correctionPositions.append(node.positionAfterSkippingLeadingTrivia)
let newNode = node
.with(\.letOrVarKeyword, .keyword(.let, presence: .missing))
.with(\.bindings, node.bindings.with(\.leadingTrivia, node.letOrVarKeyword.leadingTrivia))
.with(\.bindingKeyword, .keyword(.let, presence: .missing))
.with(\.bindings, node.bindings.with(\.leadingTrivia, node.bindingKeyword.leadingTrivia))
return super.visit(newNode)
}
}
}

private extension VariableDeclSyntax {
var hasRedundantDiscardableLetViolation: Bool {
letOrVarKeyword.tokenKind == .keyword(.let) &&
bindingKeyword.tokenKind == .keyword(.let) &&
bindings.count == 1 &&
bindings.first!.pattern.is(WildcardPatternSyntax.self) &&
bindings.first!.typeAnnotation == nil &&
Expand Down
6 changes: 3 additions & 3 deletions bazel/repos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ def swiftlint_repos(bzlmod = False):

http_archive(
name = "com_github_apple_swift_syntax",
sha256 = "ef9701634ad34e2dd08a2cd85bb5437af17512175bf6b4623c7d2d28068b6786", # SwiftSyntax sha256
sha256 = "0698b10d5784bc91fc60cd740f8c16dbe7debcea67759fdf293bb1c8bdb6eedc", # SwiftSyntax sha256
build_file = "@SwiftLint//bazel:SwiftSyntax.BUILD",
strip_prefix = "swift-syntax-0.50900.0-swift-DEVELOPMENT-SNAPSHOT-2023-02-06-a",
url = "https://github.com/apple/swift-syntax/archive/refs/tags/0.50900.0-swift-DEVELOPMENT-SNAPSHOT-2023-02-06-a.tar.gz",
strip_prefix = "swift-syntax-509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-03-17-a",
url = "https://github.com/apple/swift-syntax/archive/refs/tags/509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-03-17-a.tar.gz",
)

http_archive(
Expand Down

0 comments on commit 58a07eb

Please sign in to comment.