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

Use `raw` in SwiftSyntaxBuilder string interpolation (#4623) 

Fixing build warnings to account for
https://github.com/apple/swift-syntax/pull/1090.
This commit is contained in:
JP Simard 2022-12-05 11:26:04 -05:00 committed by GitHub
parent 7f9dd69c62
commit 95d56e4130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/SwiftLintFramework/Helpers/LegacyFunctionRuleHelper.swift
View File

@ -70,13 +70,13 @@ enum LegacyFunctionRuleHelper {
case .equal: case .equal:
expr = "\(trimmedArguments[0]) == \(trimmedArguments[1])" expr = "\(trimmedArguments[0]) == \(trimmedArguments[1])"
case let .property(name: propertyName): case let .property(name: propertyName):
expr = "\(trimmedArguments[0]).\(propertyName)" expr = "\(trimmedArguments[0]).\(raw: propertyName)"
case let .function(name: functionName, argumentLabels: argumentLabels, reversed: reversed): case let .function(name: functionName, argumentLabels: argumentLabels, reversed: reversed):
let arguments = reversed ? trimmedArguments.reversed() : trimmedArguments let arguments = reversed ? trimmedArguments.reversed() : trimmedArguments
let params = zip(argumentLabels, arguments.dropFirst()) let params = zip(argumentLabels, arguments.dropFirst())
.map { $0.isEmpty ? "\($1)" : "\($0): \($1)" } .map { $0.isEmpty ? "\($1)" : "\($0): \($1)" }
.joined(separator: ", ") .joined(separator: ", ")
expr = "\(arguments[0]).\(functionName)(\(params))" expr = "\(arguments[0]).\(raw: functionName)(\(raw: params))"
case .none: case .none:
return super.visit(node) return super.visit(node)
} }

4
Source/SwiftLintFramework/Rules/Idiomatic/LegacyConstantRule.swift
View File

@ -62,7 +62,7 @@ private extension LegacyConstantRule {
} }
correctionPositions.append(node.positionAfterSkippingLeadingTrivia) correctionPositions.append(node.positionAfterSkippingLeadingTrivia)
return ("\(correction)" as ExprSyntax) return ("\(raw: correction)" as ExprSyntax)
.withLeadingTrivia(node.leadingTrivia ?? .zero) .withLeadingTrivia(node.leadingTrivia ?? .zero)
.withTrailingTrivia(node.trailingTrivia ?? .zero) .withTrailingTrivia(node.trailingTrivia ?? .zero)
} }
@ -77,7 +77,7 @@ private extension LegacyConstantRule {
} }
correctionPositions.append(node.positionAfterSkippingLeadingTrivia) correctionPositions.append(node.positionAfterSkippingLeadingTrivia)
return ("\(calledExpression.identifier.text).pi" as ExprSyntax) return ("\(raw: calledExpression.identifier.text).pi" as ExprSyntax)
.withLeadingTrivia(node.leadingTrivia ?? .zero) .withLeadingTrivia(node.leadingTrivia ?? .zero)
.withTrailingTrivia(node.trailingTrivia ?? .zero) .withTrailingTrivia(node.trailingTrivia ?? .zero)
} }

2
Source/SwiftLintFramework/Rules/Idiomatic/PreferZeroOverExplicitInitRule.swift
View File

@ -76,7 +76,7 @@ private extension PreferZeroOverExplicitInitRule {
correctionPositions.append(node.positionAfterSkippingLeadingTrivia) correctionPositions.append(node.positionAfterSkippingLeadingTrivia)
let newNode: MemberAccessExprSyntax = "\(name).zero" let newNode: MemberAccessExprSyntax = "\(raw: name).zero"
return super.visit( return super.visit(
newNode newNode
.withLeadingTrivia(node.leadingTrivia ?? .zero) .withLeadingTrivia(node.leadingTrivia ?? .zero)