azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Basic support for when() expressions

Browse Source
This commit is contained in:
Andrey Breslav
2011-05-17 22:27:35 +04:00
parent 169f45b97b
commit 891aebf3bc
17 changed files with 389 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/checker/When.jet
+18
View File
@@ -0,0 +1,18 @@
fun foo() {
val s = ""
val x = 1
when (x) {
<error>s</error> => 1
1 => 1
1 + <error>a</error> => 1
in 1..<error>a</error> => 1
!in 1..<error>a</error> => 1
.<error>a</error> => 1
.equals(1).<error>a</error> => 1
<warning>?.</warning>equals(1) => 1
}
when (<warning>x</warning>?:null) {
<error>.</error>equals(1) => 1
?.equals(1).equals(2) => 1
}
}
idea/testData/psi/NewlinesInParentheses.txt
+4 -2
View File
@@ -254,7 +254,8 @@ JetFile: NewlinesInParentheses.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(in)('in')
OPERATION_REFERENCE
PsiElement(in)('in')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
@@ -290,7 +291,8 @@ JetFile: NewlinesInParentheses.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(NOT_IN)('!in')
OPERATION_REFERENCE
PsiElement(NOT_IN)('!in')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
idea/testData/psi/When.txt
+4 -2
View File
@@ -755,7 +755,8 @@ JetFile: When.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(in)('in')
OPERATION_REFERENCE
PsiElement(in)('in')
PsiWhiteSpace(' ')
BINARY_EXPRESSION
INTEGER_CONSTANT
@@ -772,7 +773,8 @@ JetFile: When.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(NOT_IN)('!in')
OPERATION_REFERENCE
PsiElement(NOT_IN)('!in')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('2')
idea/testData/psi/When_ERR.txt
+10 -5
View File
@@ -59,7 +59,8 @@ JetFile: When_ERR.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(in)('in')
OPERATION_REFERENCE
PsiElement(in)('in')
PsiErrorElement:Expecting an element
<empty list>
PsiWhiteSpace(' ')
@@ -70,7 +71,8 @@ JetFile: When_ERR.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(NOT_IN)('!in')
OPERATION_REFERENCE
PsiElement(NOT_IN)('!in')
PsiErrorElement:Expecting an element
<empty list>
PsiWhiteSpace(' ')
@@ -127,7 +129,8 @@ JetFile: When_ERR.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(in)('in')
OPERATION_REFERENCE
PsiElement(in)('in')
PsiErrorElement:Expecting an element
<empty list>
PsiWhiteSpace(' ')
@@ -137,7 +140,8 @@ JetFile: When_ERR.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(NOT_IN)('!in')
OPERATION_REFERENCE
PsiElement(NOT_IN)('!in')
PsiErrorElement:Expecting an element
<empty list>
PsiWhiteSpace(' ')
@@ -147,7 +151,8 @@ JetFile: When_ERR.jet
PsiWhiteSpace('\n ')
WHEN_ENTRY
WHEN_CONDITION_IN_RANGE
PsiElement(NOT_IN)('!in')
OPERATION_REFERENCE
PsiElement(NOT_IN)('!in')
PsiErrorElement:Expecting an element
<empty list>
PsiWhiteSpace(' ')