MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 11:00:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Lambda expressions support: second round

Browse Source 
- typed parameters
- type parameter list
- resolve inside lambda
This commit is contained in:
Roman Shevchenko
2012-06-08 14:34:03 +04:00
parent 54e2d2c005
commit ee50d99da0
15 changed files with 444 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
+13 -1
View File
@@ -14,15 +14,27 @@
* limitations under the License.
*/
import java.util.*;
class C {
interface Simplest {
void m();
}
void simplest() { }
void use(Simplest s) { }
interface IntParser {
int parse(String s);
}
interface ListProducer<T> {
List<T> produce();
}
void test() {
Simplest simplest = <weak_warning descr="Lambda expressions type check is not yet implemented">() -> { }</weak_warning>;
use(<weak_warning descr="Lambda expressions type check is not yet implemented">() -> { }</weak_warning>);
IntParser intParser = <weak_warning descr="Lambda expressions type check is not yet implemented">(String s) -> Integer.parseInt(s)</weak_warning>;
ListProducer<String> listProducer = <weak_warning descr="Lambda expressions type check is not yet implemented"><T>() -> new ArrayList<T>()</weak_warning>;
}
}
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression12.txt
+33
View File
@@ -0,0 +1,33 @@
PsiJavaFile:LambdaExpression12.java
PsiLambdaExpression:<T>() -> new C<T>()
PsiTypeParameterList
PsiJavaToken:LT('<')
PsiTypeParameter:T
PsiIdentifier:T('T')
PsiElement(EXTENDS_BOUND_LIST)
<empty list>
PsiJavaToken:GT('>')
PsiParameterList:()
PsiJavaToken:LPARENTH('(')
PsiJavaToken:RPARENTH(')')
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiNewExpression:new C<T>()
PsiKeyword:new('new')
PsiReferenceParameterList
<empty list>
PsiWhiteSpace(' ')
PsiJavaCodeReferenceElement:C<T>
PsiIdentifier:C('C')
PsiReferenceParameterList
PsiJavaToken:LT('<')
PsiTypeElement:T
PsiJavaCodeReferenceElement:T
PsiIdentifier:T('T')
PsiReferenceParameterList
<empty list>
PsiJavaToken:GT('>')
PsiExpressionList
PsiJavaToken:LPARENTH('(')
PsiJavaToken:RPARENTH(')')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression13.txt
+21
View File
@@ -0,0 +1,21 @@
PsiJavaFile:LambdaExpression13.java
PsiLambdaExpression:<T>t -> t
PsiTypeParameterList
PsiJavaToken:LT('<')
PsiTypeParameter:T
PsiIdentifier:T('T')
PsiElement(EXTENDS_BOUND_LIST)
<empty list>
PsiJavaToken:GT('>')
PsiParameterList:t
PsiParameter:t
PsiModifierList:
<empty list>
PsiIdentifier:t('t')
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiReferenceExpression:t
PsiReferenceParameterList
<empty list>
PsiIdentifier:t('t')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression14.txt
+22
View File
@@ -0,0 +1,22 @@
PsiJavaFile:LambdaExpression14.java
PsiLambdaExpression:(String t) -> t
PsiParameterList:(String t)
PsiJavaToken:LPARENTH('(')
PsiParameter:t
PsiModifierList:
<empty list>
PsiTypeElement:String
PsiJavaCodeReferenceElement:String
PsiIdentifier:String('String')
PsiReferenceParameterList
<empty list>
PsiWhiteSpace(' ')
PsiIdentifier:t('t')
PsiJavaToken:RPARENTH(')')
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiReferenceExpression:t
PsiReferenceParameterList
<empty list>
PsiIdentifier:t('t')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression15.txt
+36
View File
@@ -0,0 +1,36 @@
PsiJavaFile:LambdaExpression15.java
PsiLambdaExpression:(int a, int b) -> a + b
PsiParameterList:(int a, int b)
PsiJavaToken:LPARENTH('(')
PsiParameter:a
PsiModifierList:
<empty list>
PsiTypeElement:int
PsiKeyword:int('int')
PsiWhiteSpace(' ')
PsiIdentifier:a('a')
PsiJavaToken:COMMA(',')
PsiWhiteSpace(' ')
PsiParameter:b
PsiModifierList:
<empty list>
PsiTypeElement:int
PsiKeyword:int('int')
PsiWhiteSpace(' ')
PsiIdentifier:b('b')
PsiJavaToken:RPARENTH(')')
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiBinaryExpression:a + b
PsiReferenceExpression:a
PsiReferenceParameterList
<empty list>
PsiIdentifier:a('a')
PsiWhiteSpace(' ')
PsiJavaToken:PLUS('+')
PsiWhiteSpace(' ')
PsiReferenceExpression:b
PsiReferenceParameterList
<empty list>
PsiIdentifier:b('b')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression16.txt
+20
View File
@@ -0,0 +1,20 @@
PsiJavaFile:LambdaExpression16.java
PsiLambdaExpression:(final int x) -> x
PsiParameterList:(final int x)
PsiJavaToken:LPARENTH('(')
PsiParameter:x
PsiModifierList:final
PsiKeyword:final('final')
PsiWhiteSpace(' ')
PsiTypeElement:int
PsiKeyword:int('int')
PsiWhiteSpace(' ')
PsiIdentifier:x('x')
PsiJavaToken:RPARENTH(')')
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiReferenceExpression:x
PsiReferenceParameterList
<empty list>
PsiIdentifier:x('x')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression17.txt
+23
View File
@@ -0,0 +1,23 @@
PsiJavaFile:LambdaExpression17.java
PsiLambdaExpression:(String s -> s
PsiParameterList:(String s
PsiJavaToken:LPARENTH('(')
PsiParameter:s
PsiModifierList:
<empty list>
PsiTypeElement:String
PsiJavaCodeReferenceElement:String
PsiIdentifier:String('String')
PsiReferenceParameterList
<empty list>
PsiWhiteSpace(' ')
PsiIdentifier:s('s')
PsiErrorElement:')' expected
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiReferenceExpression:s
PsiReferenceParameterList
<empty list>
PsiIdentifier:s('s')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression18.txt
+34
View File
@@ -0,0 +1,34 @@
PsiJavaFile:LambdaExpression18.java
PsiLambdaExpression:(java.lang.String s, -> s
PsiParameterList:(java.lang.String s,
PsiJavaToken:LPARENTH('(')
PsiParameter:s
PsiModifierList:
<empty list>
PsiTypeElement:java.lang.String
PsiJavaCodeReferenceElement:java.lang.String
PsiJavaCodeReferenceElement:java.lang
PsiJavaCodeReferenceElement:java
PsiIdentifier:java('java')
PsiReferenceParameterList
<empty list>
PsiJavaToken:DOT('.')
PsiIdentifier:lang('lang')
PsiReferenceParameterList
<empty list>
PsiJavaToken:DOT('.')
PsiIdentifier:String('String')
PsiReferenceParameterList
<empty list>
PsiWhiteSpace(' ')
PsiIdentifier:s('s')
PsiJavaToken:COMMA(',')
PsiErrorElement:Parameter expected
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiReferenceExpression:s
PsiReferenceParameterList
<empty list>
PsiIdentifier:s('s')
java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression19.txt
+31
View File
@@ -0,0 +1,31 @@
PsiJavaFile:LambdaExpression19.java
PsiLambdaExpression:(@A T t) -> (null)
PsiParameterList:(@A T t)
PsiJavaToken:LPARENTH('(')
PsiParameter:t
PsiModifierList:@A
PsiAnnotation
PsiJavaToken:AT('@')
PsiJavaCodeReferenceElement:A
PsiIdentifier:A('A')
PsiReferenceParameterList
<empty list>
PsiAnnotationParameterList
<empty list>
PsiWhiteSpace(' ')
PsiTypeElement:T
PsiJavaCodeReferenceElement:T
PsiIdentifier:T('T')
PsiReferenceParameterList
<empty list>
PsiWhiteSpace(' ')
PsiIdentifier:t('t')
PsiJavaToken:RPARENTH(')')
PsiWhiteSpace(' ')
PsiJavaToken:ARROW('->')
PsiWhiteSpace(' ')
PsiParenthesizedExpression:(null)
PsiJavaToken:LPARENTH('(')
PsiLiteralExpression:null
PsiJavaToken:NULL_KEYWORD('null')
PsiJavaToken:RPARENTH(')')