Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions unified/extractor/ast_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ supertypes:
- boolean_literal
- string_literal
- regex_literal
- string_interpolation_expr
- builtin_expr
- binary_expr
- unary_expr
Expand Down Expand Up @@ -129,6 +130,11 @@ named:
# A regex literal
regex_literal:

# A string interpolation expression. Constant parts are stored as string literals.
string_interpolation_expr:
modifier*: modifier
element*: expr

# Application of a binary operator, such as `a + b`
binary_expr:
left: expr
Expand Down
24 changes: 21 additions & 3 deletions unified/extractor/src/languages/swift/swift.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,27 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
rule!((nilLiteralExpr) @@node => expr {
tree!((builtin_expr #{node}))
}),
rule!((stringLiteralExpr) @@node => expr {
tree!((string_literal #{node}))
}),
rule!((simpleStringLiteralExpr) @@node => (string_literal #{node})),
// String literal with a single constant segment (for some reason not typed as simpleStringLiteralExpr)
rule!(
(stringLiteralExpr segments: (stringSegment) segments: _* @@rest) @@node
where rest.is_empty()
=>
(string_literal #{node})
),
rule!(
(stringLiteralExpr segments: _* @segments)
=>
(string_interpolation_expr element: {segments})
),
rule!((stringSegment content: @@content) => (string_literal #{content})),
rule!(
(expressionSegment expressions: _* @expressions)
=>
(call_expr
callee: (builtin_expr "interpolation")
argument: {expressions})
),
rule!((regexLiteralExpr) @@node => expr {
tree!((regex_literal #{node}))
}),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
// Simple interpolation
"hello \(name)"

// Multiple interpolations
"hello \(first) \(last)"

// Interpolation with expression
"result: \(x + y)"

// Plain string before and after interpolation
"prefix \(value) suffix"

// Calls to custom DefaultStringInterpolation.appendInterpolation impls
"foo \(x, y)"
"foo \(x, y, z)"
"foo \(arg: x)"
"foo \(arg: x, arg2: y)"

---

sourceFile
Expand All @@ -24,10 +40,281 @@ sourceFile
baseName: identifier "name"
stringSegment
content: stringSegment
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "hello "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
expression:
declReferenceExpr
baseName: identifier "first"
stringSegment
content: stringSegment " "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
expression:
declReferenceExpr
baseName: identifier "last"
stringSegment
content: stringSegment
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "result: "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
expression:
infixOperatorExpr
operator:
binaryOperatorExpr
operator: binaryOperator "+"
leftOperand:
declReferenceExpr
baseName: identifier "x"
rightOperand:
declReferenceExpr
baseName: identifier "y"
stringSegment
content: stringSegment
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "prefix "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
expression:
declReferenceExpr
baseName: identifier "value"
stringSegment
content: stringSegment " suffix"
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "foo "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
expression:
declReferenceExpr
baseName: identifier "x"
trailingComma: ,
labeledExpr
expression:
declReferenceExpr
baseName: identifier "y"
stringSegment
content: stringSegment
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "foo "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
expression:
declReferenceExpr
baseName: identifier "x"
trailingComma: ,
labeledExpr
expression:
declReferenceExpr
baseName: identifier "y"
trailingComma: ,
labeledExpr
expression:
declReferenceExpr
baseName: identifier "z"
stringSegment
content: stringSegment
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "foo "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
colon: :
label: identifier "arg"
expression:
declReferenceExpr
baseName: identifier "x"
stringSegment
content: stringSegment
codeBlockItem
item:
stringLiteralExpr
closingQuote: "
openingQuote: "
segments:
stringSegment
content: stringSegment "foo "
expressionSegment
leftParen: (
rightParen: )
backslash: \
expressions:
labeledExpr
colon: :
label: identifier "arg"
expression:
declReferenceExpr
baseName: identifier "x"
trailingComma: ,
labeledExpr
colon: :
label: identifier "arg2"
expression:
declReferenceExpr
baseName: identifier "y"
stringSegment
content: stringSegment

---

top_level
body:
block
stmt: string_literal "\"hello \\(name)\""
stmt:
string_interpolation_expr
element:
string_literal "hello "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value: identifier "name"
string_literal
string_interpolation_expr
element:
string_literal "hello "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value: identifier "first"
string_literal " "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value: identifier "last"
string_literal
string_interpolation_expr
element:
string_literal "result: "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value:
binary_expr
left: identifier "x"
operator: infix_operator "+"
right: identifier "y"
string_literal
string_interpolation_expr
element:
string_literal "prefix "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value: identifier "value"
string_literal " suffix"
string_interpolation_expr
element:
string_literal "foo "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value: identifier "x"
argument
value: identifier "y"
string_literal
string_interpolation_expr
element:
string_literal "foo "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
value: identifier "x"
argument
value: identifier "y"
argument
value: identifier "z"
string_literal
string_interpolation_expr
element:
string_literal "foo "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
name_node: identifier "arg"
value: identifier "x"
string_literal
string_interpolation_expr
element:
string_literal "foo "
call_expr
callee: builtin_expr "interpolation"
argument:
argument
name_node: identifier "arg"
value: identifier "x"
argument
name_node: identifier "arg2"
value: identifier "y"
string_literal
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
// Simple interpolation
"hello \(name)"

// Multiple interpolations
"hello \(first) \(last)"

// Interpolation with expression
"result: \(x + y)"

// Plain string before and after interpolation
"prefix \(value) suffix"

// Calls to custom DefaultStringInterpolation.appendInterpolation impls
"foo \(x, y)"
"foo \(x, y, z)"
"foo \(arg: x)"
"foo \(arg: x, arg2: y)"
Loading
Loading