SR-10469 Unknown syntax for interpolated string literal #24280

kitasuke · 2019-04-25T19:50:54Z

Overview

This PR fixes unknown syntax for interpolated string literal by changing Expr kind of Expression in ExpressionSegment to FunctionCallArgumentList

Ticket

Resolves #52869.

kitasuke · 2019-04-25T19:52:28Z

test/IDE/complete_expr_postfix_begin.swift

@@ -1,7 +1,7 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_1 | %FileCheck %s -check-prefix=COMMON
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_2 | %FileCheck %s -check-prefix=COMMON
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_3 | %FileCheck %s -check-prefix=COMMON
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_4 | %FileCheck %s -check-prefix=COMMON
+// RUN-FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPR_POSTFIX_BEGIN_4 | %FileCheck %s -check-prefix=COMMON


I wasn't able to fix this failing test, so changed to RUN-FIXME for now. Can someone give me a better solution?

It's OK for now. I'll fix this after merging this.

rintaro · 2019-04-25T20:03:10Z

Could you add test cases with multiple arguments with labels? Like "test \(foo, default: 2)".

rintaro · 2019-04-25T22:13:18Z

utils/gyb_syntax_support/ExprNodes.py

@@ -460,7 +460,7 @@
             Child('LeftParen', kind='LeftParenToken',
                   classification='StringInterpolationAnchor',
                   force_classification=True),
-             Child('Expression', kind='Expr'),
+             Child('Expressions', kind='FunctionCallArgumentList'),


You probably need collection_element_name after #24227 .

kitasuke · 2019-04-27T07:44:04Z

Thank you for your feedback! Will add the test cases

kitasuke · 2019-04-27T19:07:25Z

@rintaro Addressed your feedbacks

rintaro · 2019-04-29T16:55:51Z

@swift-ci Please smoke test

rintaro · 2019-04-29T20:36:36Z

@swift-ci Please smoke test Linux platform

rintaro · 2019-04-29T23:28:28Z

@swift-ci Please smoke test Linux platform

rintaro · 2019-04-30T00:35:05Z

Thank you!

shahmishal · 2019-04-30T06:09:47Z

Test failure, going to revert to unblock PR testing.

https://ci.swift.org/job/oss-swift-pr-test/7259/changes#detail

01:41:07.590 ******************** TEST 'SwiftSyntax :: print_verify_tree.swift' FAILED ********************
01:41:07.590 Script:
01:41:07.590 --
01:41:07.590 : 'RUN: at line 1';   rm -rf "/private/var/folders/_8/79jmzf2142z2xydc_01btlx00000gn/T/Output/print_verify_tree.swift.tmp" && mkdir -p "/private/var/folders/_8/79jmzf2142z2xydc_01btlx00000gn/T/Output/print_verify_tree.swift.tmp"
01:41:07.590 : 'RUN: at line 2';   /Users/buildnode/jenkins/workspace/oss-swift-pr-test/buildbot_incremental/swiftsyntax-macosx-x86_64/x86_64-apple-macosx/release/lit-test-helper -print-tree -source-file /Users/buildnode/jenkins/workspace/oss-swift-pr-test/swift-syntax/lit_tests/print_verify_tree.swift > /private/var/folders/_8/79jmzf2142z2xydc_01btlx00000gn/T/Output/print_verify_tree.swift.tmp.result
01:41:07.590 : 'RUN: at line 3';   diff -u /private/var/folders/_8/79jmzf2142z2xydc_01btlx00000gn/T/Output/print_verify_tree.swift.tmp.result /Users/buildnode/jenkins/workspace/oss-swift-pr-test/swift-syntax/lit_tests/output/print_verify_tree.swift.withkind
01:41:07.590 --
01:41:07.590 Exit Code: 1
01:41:07.590 
01:41:07.590 Command Output (stdout):
01:41:07.590 --
01:41:07.590 --- /private/var/folders/_8/79jmzf2142z2xydc_01btlx00000gn/T/Output/print_verify_tree.swift.tmp.result	2019-04-29 20:11:11.000000000 -0700
01:41:07.590 +++ /Users/buildnode/jenkins/workspace/oss-swift-pr-test/swift-syntax/lit_tests/output/print_verify_tree.swift.withkind	2019-04-29 05:37:46.000000000 -0700
01:41:07.590 @@ -4,8 +4,8 @@
01:41:07.590  
01:41:07.590  func </TokenSyntax><TokenSyntax>foo</TokenSyntax><FunctionSignatureSyntax><ParameterClauseSyntax><TokenSyntax>(</TokenSyntax><FunctionParameterListSyntax></FunctionParameterListSyntax><TokenSyntax>) </TokenSyntax></ParameterClauseSyntax></FunctionSignatureSyntax><CodeBlockSyntax><TokenSyntax>{</TokenSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><IfConfigDeclSyntax><IfConfigClauseListSyntax><IfConfigClauseSyntax><TokenSyntax>
01:41:07.590  #if </TokenSyntax><FunctionCallExprSyntax><IdentifierExprSyntax><TokenSyntax>swift</TokenSyntax></IdentifierExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><PrefixOperatorExprSyntax><TokenSyntax>>=</TokenSyntax><FloatLiteralExprSyntax><TokenSyntax>3.2</TokenSyntax></FloatLiteralExprSyntax></PrefixOperatorExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>
01:41:07.590 -    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><StringInterpolationExprSyntax><TokenSyntax>"</TokenSyntax><StringInterpolationSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><SubscriptExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>[</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><PrefixOperatorExprSyntax><TokenSyntax>..<</TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></PrefixOperatorExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>]</TokenSyntax></SubscriptExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringInterpolationSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringInterpolationExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax><IfConfigClauseSyntax><TokenSyntax>
01:41:07.590 +    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><StringInterpolationExprSyntax><TokenSyntax>"</TokenSyntax><StringInterpolationSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><SubscriptExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>[</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><PrefixOperatorExprSyntax><TokenSyntax>..<</TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></PrefixOperatorExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>]</TokenSyntax></SubscriptExprSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringInterpolationSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringInterpolationExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax><IfConfigClauseSyntax><TokenSyntax>
01:41:07.590  #else</TokenSyntax><CodeBlockItemListSyntax><CodeBlockItemSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>
01:41:07.590 -    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><StringInterpolationExprSyntax><TokenSyntax>"</TokenSyntax><StringInterpolationSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>substring</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>to</TokenSyntax><TokenSyntax>: </TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>characters</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringInterpolationSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringInterpolationExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax></IfConfigClauseListSyntax><TokenSyntax>
01:41:07.590 +    components</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>append</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><StringInterpolationExprSyntax><TokenSyntax>"</TokenSyntax><StringInterpolationSegmentsSyntax><StringSegmentSyntax><TokenSyntax>-b \"</TokenSyntax></StringSegmentSyntax><ExpressionSegmentSyntax><TokenSyntax>\</TokenSyntax><TokenSyntax>(</TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>substring</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>to</TokenSyntax><TokenSyntax>: </TokenSyntax><FunctionCallExprSyntax><MemberAccessExprSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>characters</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>index</TokenSyntax></MemberAccessExprSyntax><TokenSyntax>(</TokenSyntax><FunctionCallArgumentListSyntax><FunctionCallArgumentSyntax><TokenSyntax>before</TokenSyntax><TokenSyntax>: </TokenSyntax><MemberAccessExprSyntax><IdentifierExprSyntax><TokenSyntax>string</TokenSyntax></IdentifierExprSyntax><TokenSyntax>.</TokenSyntax><TokenSyntax>endIndex</TokenSyntax></MemberAccessExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax><TokenSyntax>)</TokenSyntax></ExpressionSegmentSyntax><StringSegmentSyntax><TokenSyntax>\"</TokenSyntax></StringSegmentSyntax></StringInterpolationSegmentsSyntax><TokenSyntax>"</TokenSyntax></StringInterpolationExprSyntax></FunctionCallArgumentSyntax></FunctionCallArgumentListSyntax><TokenSyntax>)</TokenSyntax></FunctionCallExprSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax></IfConfigClauseSyntax></IfConfigClauseListSyntax><TokenSyntax>
01:41:07.590  #endif</TokenSyntax></IfConfigDeclSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax><TokenSyntax>
01:41:07.590  }</TokenSyntax></CodeBlockSyntax></FunctionDeclSyntax></CodeBlockItemSyntax></CodeBlockItemListSyntax><TokenSyntax></TokenSyntax></SourceFileSyntax>
01:41:07.590 \ No newline at end of file
01:41:07.590 
01:41:07.590 --
01:41:07.590 
01:41:07.590 ********************

kitasuke · 2019-04-30T18:42:51Z

Sorry about the failed test. I'm working on the fix and will create a new PR.

kitasuke added 2 commits April 23, 2019 17:54

Change expression kind from Expr to FunctionCallArgumentList

abd6dcf

Mark failed test as RUN-FIXME temporally

cb1c6c5

kitasuke commented Apr 25, 2019

View reviewed changes

rintaro reviewed Apr 25, 2019

View reviewed changes

kitasuke added 2 commits April 26, 2019 06:29

Merge branch 'master' into SR-10469-func-call-args_list

81ed9cc

Set collection element name for ExpressionSegment's Expressions

790d359

Add test cases for multi expressions in ExpressionSegment

27cb9c4

rintaro approved these changes Apr 30, 2019

View reviewed changes

rintaro merged commit 9b6ba43 into swiftlang:master Apr 30, 2019

shahmishal mentioned this pull request Apr 30, 2019

Revert "SR-10469 Unknown syntax for interpolated string literal" #24385

Merged

kitasuke deleted the SR-10469-func-call-args_list branch May 1, 2019 18:29

rintaro mentioned this pull request May 16, 2019

[5.1][Parse/Syntax] Changes for string literal parsing #24846

Merged

rintaro mannequin mentioned this pull request Jun 11, 2019

[SR-10469] Unknown syntax for interpolated string literal #52869

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

SR-10469 Unknown syntax for interpolated string literal #24280

SR-10469 Unknown syntax for interpolated string literal #24280

Uh oh!

kitasuke commented Apr 25, 2019 •

edited by AnthonyLatsis

Loading

Uh oh!

kitasuke Apr 25, 2019

Uh oh!

rintaro Apr 25, 2019

Uh oh!

rintaro commented Apr 25, 2019

Uh oh!

rintaro Apr 25, 2019

Uh oh!

kitasuke commented Apr 27, 2019

Uh oh!

kitasuke commented Apr 27, 2019

Uh oh!

rintaro commented Apr 29, 2019

Uh oh!

rintaro commented Apr 29, 2019

Uh oh!

rintaro commented Apr 29, 2019

Uh oh!

rintaro commented Apr 30, 2019

Uh oh!

shahmishal commented Apr 30, 2019

Uh oh!

kitasuke commented Apr 30, 2019

Uh oh!

Uh oh!

SR-10469 Unknown syntax for interpolated string literal #24280

SR-10469 Unknown syntax for interpolated string literal #24280

Uh oh!

Conversation

kitasuke commented Apr 25, 2019 • edited by AnthonyLatsis Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Ticket

Uh oh!

kitasuke Apr 25, 2019

Choose a reason for hiding this comment

Uh oh!

rintaro Apr 25, 2019

Choose a reason for hiding this comment

Uh oh!

rintaro commented Apr 25, 2019

Uh oh!

rintaro Apr 25, 2019

Choose a reason for hiding this comment

Uh oh!

kitasuke commented Apr 27, 2019

Uh oh!

kitasuke commented Apr 27, 2019

Uh oh!

rintaro commented Apr 29, 2019

Uh oh!

rintaro commented Apr 29, 2019

Uh oh!

rintaro commented Apr 29, 2019

Uh oh!

rintaro commented Apr 30, 2019

Uh oh!

shahmishal commented Apr 30, 2019

Uh oh!

kitasuke commented Apr 30, 2019

Uh oh!

Uh oh!

kitasuke commented Apr 25, 2019 •

edited by AnthonyLatsis

Loading