Skip to content

Fix cases where syntax nodes were constructed with incorrect token kinds #1481

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
ahoppen merged 1 commit into from
Apr 5, 2023
Merged

Fix cases where syntax nodes were constructed with incorrect token kinds #1481

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
34 changes: 27 additions & 7 deletions Sources/SwiftOperators/SyntaxSynthesis.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,26 @@

import SwiftSyntax

fileprivate extension OperatorKind {
var keyword: Keyword {
switch self {
case .infix: return .infix
case .prefix: return .prefix
case .postfix: return .postfix
}
}
}

extension Operator {
/// Synthesize a syntactic representation of this operator based on its
/// semantic definition.
public func synthesizedSyntax() -> OperatorDeclSyntax {
let modifiers = ModifierListSyntax(
[DeclModifierSyntax(name: .identifier("\(kind)"))]
[DeclModifierSyntax(name: .keyword(kind.keyword))]
)
let operatorKeyword = TokenSyntax.keyword(.operator, leadingTrivia: .space)
let identifierSyntax =
TokenSyntax.identifier(name, leadingTrivia: .space)
TokenSyntax.binaryOperator(name, leadingTrivia: .space)
let precedenceGroupSyntax = precedenceGroup.map { groupName in
OperatorPrecedenceAndTypesSyntax(
colon: .colonToken(),
Expand Down Expand Up @@ -64,6 +74,16 @@ extension PrecedenceRelation {
}
}

fileprivate extension Associativity {
var keyword: Keyword {
switch self {
case .none: return .none
case .left: return .left
case .right: return .right
}
}
}

extension PrecedenceGroup {
/// Synthesize a syntactic representation of this precedence group based on
/// its semantic definition.
Expand All @@ -83,12 +103,12 @@ extension PrecedenceGroup {
.init(
PrecedenceGroupAssociativitySyntax(
associativityKeyword:
.identifier(
"associativity",
.keyword(
.associativity,
leadingTrivia: [.newlines(1), .spaces(indentation)]
),
colon: .colonToken(),
value: .identifier("\(associativity)", leadingTrivia: .space)
value: .keyword(associativity.keyword, leadingTrivia: .space)
)
)
)
Expand All @@ -103,8 +123,8 @@ extension PrecedenceGroup {
.init(
PrecedenceGroupAssignmentSyntax(
assignmentKeyword:
.identifier(
"assignment",
.keyword(
.assignment,
leadingTrivia: [.newlines(1), .spaces(indentation)]
),
colon: .colonToken(),
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ extension ExpressibleByLiteralSyntax where Self: FloatingPoint, Self: LosslessSt
case .negativeInfinity, .negativeZero:
return ExprSyntax(
PrefixOperatorExprSyntax(
operatorToken: "-",
operatorToken: .prefixOperator("-"),
postfixExpression: (-self).makeLiteralSyntax()
)
)
Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ final class FloatLiteralTests: XCTestCase {
let testCases: [UInt: (FloatLiteralExprSyntax, String)] = [
#line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral(String(123.321))), "123.321"),
#line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral(String(-123.321))), "-123.321"),
#line: (FloatLiteralExprSyntax(floatingDigits: "2_123.321"), "2_123.321"),
#line: (FloatLiteralExprSyntax(floatingDigits: "-2_123.321"), "-2_123.321"),
#line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral("2_123.321")), "2_123.321"),
#line: (FloatLiteralExprSyntax(floatingDigits: .floatingLiteral("-2_123.321")), "-2_123.321"),
#line: (FloatLiteralExprSyntax(2_123.321), "2123.321"),
#line: (FloatLiteralExprSyntax(-2_123.321), "-2123.321"),
#line: (2_123.321, "2123.321"),
Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ final class IntegerLiteralTests: XCTestCase {
let testCases: [UInt: (IntegerLiteralExprSyntax, String)] = [
#line: (IntegerLiteralExprSyntax(digits: .integerLiteral(String(123))), "123"),
#line: (IntegerLiteralExprSyntax(digits: .integerLiteral(String(-123))), "-123"),
#line: (IntegerLiteralExprSyntax(digits: "1_000"), "1_000"),
#line: (IntegerLiteralExprSyntax(digits: "-1_000"), "-1_000"),
#line: (IntegerLiteralExprSyntax(digits: .integerLiteral("1_000")), "1_000"),
#line: (IntegerLiteralExprSyntax(digits: .integerLiteral("-1_000")), "-1_000"),
#line: (IntegerLiteralExprSyntax(1_000), "1000"),
#line: (IntegerLiteralExprSyntax(-1_000), "-1000"),
#line: (1_000, "1000"),
Expand Down
8 changes: 4 additions & 4 deletions Tests/SwiftSyntaxParserTest/SyntaxComparisonTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public class SyntaxComparisonTests: XCTestCase {
}

public func testDifferentTokenKind() throws {
let expected = Syntax(makeFunc(identifier: .identifier("f"), keyword: .keyword(.class)))
let expected = Syntax(makeFunc(identifier: .binaryOperator("f")))

func expectations(_ diff: TreeDifference?, file: StaticString = #filePath, line: UInt = #line) throws {
let diff = try XCTUnwrap(diff, file: file, line: line)
XCTAssertEqual(diff.reason, .token)
XCTAssertEqual(Syntax(diff.baseline).as(TokenSyntax.self)?.tokenKind, .keyword(.class))
XCTAssertEqual(Syntax(diff.node).as(TokenSyntax.self)?.tokenKind, .keyword(.func))
XCTAssertEqual(Syntax(diff.baseline).as(TokenSyntax.self)?.tokenKind, .binaryOperator("f"))
XCTAssertEqual(Syntax(diff.node).as(TokenSyntax.self)?.tokenKind, .identifier("f"))
}

let actual = Syntax(makeFunc(identifier: .identifier("f")))
Expand Down Expand Up @@ -98,7 +98,7 @@ public class SyntaxComparisonTests: XCTestCase {
body: CodeBlockSyntax(
leftBrace: .leftBraceToken(presence: .missing),
statements: CodeBlockItemListSyntax([]),
rightBrace: .leftBraceToken(presence: .missing)
rightBrace: .rightBraceToken(presence: .missing)
)
)
)
Expand Down