From ab3b63c92a0330bf0940d339a56ba97a2ac448ee Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Sun, 1 Dec 2019 02:11:00 +0300 Subject: [PATCH] [Spec tests] Apply changes in parse trees due to trailing comma introducing --- .../linked/expressions/when-expression/p-2/neg/2.2.kt | 4 ++-- .../linked/expressions/when-expression/p-2/neg/2.2.txt | 10 ++++------ .../linked/expressions/when-expression/p-5/neg/1.3.kt | 2 +- .../linked/expressions/when-expression/p-5/neg/1.3.txt | 2 ++ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt index 786e6faf87c..ba5bdb0e287 100644 --- a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt +++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt @@ -9,8 +9,8 @@ fun case_1() { when { - value == 21, -> return "" - value is Int, value is String, -> return "" + value == 21,, -> return "" + value is Int, ,value is String, -> return "" value in -100..100, value in value, -> return "" } when { diff --git a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.txt index 4560322330e..858f86f47e5 100644 --- a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.txt +++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.txt @@ -31,6 +31,8 @@ KtFile: 2.2.kt INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('21') PsiElement(COMMA)(',') + PsiErrorElement:Expecting a when-condition + PsiElement(COMMA)(',') PsiWhiteSpace(' ') WHEN_CONDITION_WITH_EXPRESSION PsiErrorElement:Expecting an expression, is-condition or in-condition @@ -59,6 +61,8 @@ KtFile: 2.2.kt PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') + PsiErrorElement:Expecting a when-condition + PsiElement(COMMA)(',') WHEN_CONDITION_WITH_EXPRESSION IS_EXPRESSION REFERENCE_EXPRESSION @@ -73,9 +77,6 @@ KtFile: 2.2.kt PsiElement(IDENTIFIER)('String') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - WHEN_CONDITION_WITH_EXPRESSION - PsiErrorElement:Expecting an expression, is-condition or in-condition - PsiElement(ARROW)('->') PsiWhiteSpace(' ') RETURN @@ -118,9 +119,6 @@ KtFile: 2.2.kt PsiElement(IDENTIFIER)('value') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - WHEN_CONDITION_WITH_EXPRESSION - PsiErrorElement:Expecting an expression, is-condition or in-condition - PsiElement(ARROW)('->') PsiWhiteSpace(' ') RETURN diff --git a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt index a136e95c999..533e5fb0709 100644 --- a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt +++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt @@ -9,7 +9,7 @@ fun case_1() { when (value) { - -10000, value.getInt(11), Int.MIN_VALUE, -> return "" + -10000, value.getInt(11), Int.MIN_VALUE,, -> return "" 21, , -> return "" , , -> return "" , value.getInt(11) -> return "" diff --git a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.txt index 1c608a7efad..50fbf13ffcf 100644 --- a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.txt +++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.txt @@ -57,6 +57,8 @@ KtFile: 1.3.kt REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('MIN_VALUE') PsiElement(COMMA)(',') + PsiErrorElement:Expecting a when-condition + PsiElement(COMMA)(',') PsiWhiteSpace(' ') WHEN_CONDITION_WITH_EXPRESSION PsiErrorElement:Expecting an expression, is-condition or in-condition