Skip to content

Commit 63e548d

Browse files
VISTALLVISTALL
committed
since java.api not depends to ide.api - test fixes
1 parent b4ff980 commit 63e548d

20 files changed

Lines changed: 237 additions & 671 deletions

‎spel-lang-impl/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,17 @@
8686
<scope>provided</scope>
8787
</dependency>
8888

89-
<dependency>
90-
<groupId>consulo</groupId>
91-
<artifactId>consulo-ide-api</artifactId>
92-
<version>${project.version}</version>
93-
<scope>provided</scope>
94-
</dependency>
9589
<dependency>
9690
<groupId>consulo.plugin</groupId>
9791
<artifactId>consulo.java-java.language.api</artifactId>
9892
<version>${project.version}</version>
9993
<scope>provided</scope>
94+
<exclusions>
95+
<exclusion>
96+
<groupId>consulo</groupId>
97+
<artifactId>consulo-ide-api</artifactId>
98+
</exclusion>
99+
</exclusions>
100100
</dependency>
101101

102102
<dependency>

‎spel-lang-impl/src/main/java/module-info.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
requires consulo.language.api;
1919
requires consulo.language.impl;
2020
requires consulo.language.editor.api;
21-
requires consulo.java.language.api;
2221

2322
requires com.intellij.spring.spel.language.api;
2423

‎spel-lang-impl/src/test/resources/parsing/Arithmetic.txt‎

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,27 @@
11
SpELFile: Arithmetic.spel
2-
SpELExpressionImpl(EXPRESSION)
3-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
4-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
5-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
6-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
7-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
8-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
9-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
10-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
11-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
12-
SpELPowerExpressionImpl(POWER_EXPRESSION)
13-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
14-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
15-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
16-
PsiElement(INTEGER_LITERAL)('1')
17-
PsiWhiteSpace(' ')
18-
PsiElement(+)('+')
19-
PsiWhiteSpace(' ')
20-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
21-
SpELPowerExpressionImpl(POWER_EXPRESSION)
22-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
23-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
24-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
25-
PsiElement(INTEGER_LITERAL)('2')
26-
PsiWhiteSpace(' ')
27-
PsiElement(*)('*')
28-
PsiWhiteSpace(' ')
29-
SpELPowerExpressionImpl(POWER_EXPRESSION)
30-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
31-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
32-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
33-
PsiElement(INTEGER_LITERAL)('3')
34-
PsiWhiteSpace(' ')
35-
PsiElement(-)('-')
36-
PsiWhiteSpace(' ')
37-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
38-
SpELPowerExpressionImpl(POWER_EXPRESSION)
39-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
40-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
41-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
42-
PsiElement(INTEGER_LITERAL)('4')
43-
PsiWhiteSpace(' ')
44-
PsiElement(/)('/')
45-
PsiWhiteSpace(' ')
46-
SpELPowerExpressionImpl(POWER_EXPRESSION)
47-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
48-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
49-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
50-
PsiElement(INTEGER_LITERAL)('2')
2+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
3+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
4+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
5+
PsiElement(INTEGER_LITERAL)('1')
6+
PsiWhiteSpace(' ')
7+
PsiElement(+)('+')
8+
PsiWhiteSpace(' ')
9+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
10+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
11+
PsiElement(INTEGER_LITERAL)('2')
12+
PsiWhiteSpace(' ')
13+
PsiElement(*)('*')
14+
PsiWhiteSpace(' ')
15+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
16+
PsiElement(INTEGER_LITERAL)('3')
17+
PsiWhiteSpace(' ')
18+
PsiElement(-)('-')
19+
PsiWhiteSpace(' ')
20+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
21+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
22+
PsiElement(INTEGER_LITERAL)('4')
23+
PsiWhiteSpace(' ')
24+
PsiElement(/)('/')
25+
PsiWhiteSpace(' ')
26+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
27+
PsiElement(INTEGER_LITERAL)('2')

‎spel-lang-impl/src/test/resources/parsing/BeanReference.txt‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
11
SpELFile: BeanReference.spel
2-
SpELExpressionImpl(EXPRESSION)
3-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
4-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
5-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
6-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
7-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
8-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
9-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
10-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
11-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
12-
SpELPowerExpressionImpl(POWER_EXPRESSION)
13-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
14-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
15-
SpELBeanReferenceImpl(BEAN_REFERENCE)
16-
PsiElement(@)('@')
17-
PsiElement(IDENTIFIER)('myBean')
2+
SpELBeanReferenceImpl(BEAN_REFERENCE)
3+
PsiElement(@)('@')
4+
PsiElement(IDENTIFIER)('myBean')

‎spel-lang-impl/src/test/resources/parsing/Comparison.txt‎

Lines changed: 20 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,21 @@
11
SpELFile: Comparison.spel
2-
SpELExpressionImpl(EXPRESSION)
3-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
4-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
5-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
6-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
7-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
8-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
9-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
10-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
11-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
12-
SpELPowerExpressionImpl(POWER_EXPRESSION)
13-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
14-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
15-
PsiElement(IDENTIFIER)('x')
16-
PsiWhiteSpace(' ')
17-
PsiElement(>=)('>=')
18-
PsiWhiteSpace(' ')
19-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
20-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
21-
SpELPowerExpressionImpl(POWER_EXPRESSION)
22-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
23-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
24-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
25-
PsiElement(INTEGER_LITERAL)('10')
26-
PsiWhiteSpace(' ')
27-
PsiElement(and)('and')
28-
PsiWhiteSpace(' ')
29-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
30-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
31-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
32-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
33-
SpELPowerExpressionImpl(POWER_EXPRESSION)
34-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
35-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
36-
PsiElement(IDENTIFIER)('x')
37-
PsiWhiteSpace(' ')
38-
PsiElement(<=)('<=')
39-
PsiWhiteSpace(' ')
40-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
41-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
42-
SpELPowerExpressionImpl(POWER_EXPRESSION)
43-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
44-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
45-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
46-
PsiElement(INTEGER_LITERAL)('100')
2+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
3+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
4+
SpELReferenceExpressionImpl(REFERENCE_EXPRESSION)
5+
PsiElement(IDENTIFIER)('x')
6+
PsiWhiteSpace(' ')
7+
PsiElement(>=)('>=')
8+
PsiWhiteSpace(' ')
9+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
10+
PsiElement(INTEGER_LITERAL)('10')
11+
PsiWhiteSpace(' ')
12+
PsiElement(AND)('and')
13+
PsiWhiteSpace(' ')
14+
SpELBinaryExpressionImpl(BINARY_EXPRESSION)
15+
SpELReferenceExpressionImpl(REFERENCE_EXPRESSION)
16+
PsiElement(IDENTIFIER)('x')
17+
PsiWhiteSpace(' ')
18+
PsiElement(<=)('<=')
19+
PsiWhiteSpace(' ')
20+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
21+
PsiElement(INTEGER_LITERAL)('100')

‎spel-lang-impl/src/test/resources/parsing/Complex.txt‎

Lines changed: 34 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,35 @@
11
SpELFile: Complex.spel
2-
SpELExpressionImpl(EXPRESSION)
3-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
4-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
5-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
6-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
7-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
8-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
9-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
10-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
11-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
12-
SpELPowerExpressionImpl(POWER_EXPRESSION)
13-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
14-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
15-
SpELTypeReferenceImpl(TYPE_REFERENCE)
16-
PsiElement(T)('T')
17-
PsiElement(()('(')
18-
SpELQualifiedNameImpl(QUALIFIED_NAME)
19-
PsiElement(IDENTIFIER)('java')
20-
PsiElement(.)('.')
21-
PsiElement(IDENTIFIER)('lang')
22-
PsiElement(.)('.')
23-
PsiElement(IDENTIFIER)('Math')
24-
PsiElement())(')')
25-
SpELDotAccessImpl(DOT_ACCESS)
26-
PsiElement(.)('.')
27-
SpELMethodCallImpl(METHOD_CALL)
28-
PsiElement(IDENTIFIER)('max')
29-
PsiElement(()('(')
30-
SpELArgumentListImpl(ARGUMENT_LIST)
31-
SpELExpressionImpl(EXPRESSION)
32-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
33-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
34-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
35-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
36-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
37-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
38-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
39-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
40-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
41-
SpELPowerExpressionImpl(POWER_EXPRESSION)
42-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
43-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
44-
SpELVariableReferenceImpl(VARIABLE_REFERENCE)
45-
PsiElement(#)('#')
46-
PsiElement(IDENTIFIER)('value')
47-
PsiElement(,)(',')
48-
PsiWhiteSpace(' ')
49-
SpELExpressionImpl(EXPRESSION)
50-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
51-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
52-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
53-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
54-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
55-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
56-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
57-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
58-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
59-
SpELPowerExpressionImpl(POWER_EXPRESSION)
60-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
61-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
62-
SpELBeanReferenceImpl(BEAN_REFERENCE)
63-
PsiElement(@)('@')
64-
PsiElement(IDENTIFIER)('config')
65-
SpELDotAccessImpl(DOT_ACCESS)
66-
PsiElement(.)('.')
67-
PsiElement(IDENTIFIER)('threshold')
68-
PsiWhiteSpace(' ')
69-
PsiElement(?:)('?:')
70-
PsiWhiteSpace(' ')
71-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
72-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
73-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
74-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
75-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
76-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
77-
SpELPowerExpressionImpl(POWER_EXPRESSION)
78-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
79-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
80-
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
81-
PsiElement(INTEGER_LITERAL)('0')
82-
PsiElement())(')')
2+
SpELMethodCallExpressionImpl(METHOD_CALL_EXPRESSION)
3+
SpELReferenceExpressionImpl(REFERENCE_EXPRESSION)
4+
SpELTypeReferenceImpl(TYPE_REFERENCE)
5+
PsiElement(T)('T')
6+
PsiElement(()('(')
7+
SpELQualifiedNameImpl(QUALIFIED_NAME)
8+
PsiElement(IDENTIFIER)('java')
9+
PsiElement(.)('.')
10+
PsiElement(IDENTIFIER)('lang')
11+
PsiElement(.)('.')
12+
PsiElement(IDENTIFIER)('Math')
13+
PsiElement())(')')
14+
PsiElement(.)('.')
15+
PsiElement(IDENTIFIER)('max')
16+
SpELExpressionListImpl(EXPRESSION_LIST)
17+
PsiElement(()('(')
18+
SpELVariableReferenceImpl(VARIABLE_REFERENCE)
19+
PsiElement(#)('#')
20+
PsiElement(IDENTIFIER)('value')
21+
PsiElement(,)(',')
22+
PsiWhiteSpace(' ')
23+
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
24+
SpELReferenceExpressionImpl(REFERENCE_EXPRESSION)
25+
SpELBeanReferenceImpl(BEAN_REFERENCE)
26+
PsiElement(@)('@')
27+
PsiElement(IDENTIFIER)('config')
28+
PsiElement(.)('.')
29+
PsiElement(IDENTIFIER)('threshold')
30+
PsiWhiteSpace(' ')
31+
PsiElement(?:)('?:')
32+
PsiWhiteSpace(' ')
33+
SpELLiteralExpressionImpl(LITERAL_EXPRESSION)
34+
PsiElement(INTEGER_LITERAL)('0')
35+
PsiElement())(')')

‎spel-lang-impl/src/test/resources/parsing/Constructor.txt‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
SpELFile: Constructor.spel
2-
SpELExpressionImpl(EXPRESSION)
3-
SpELAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
4-
SpELTernaryExpressionImpl(TERNARY_EXPRESSION)
5-
SpELElvisExpressionImpl(ELVIS_EXPRESSION)
6-
SpELLogicalOrExpressionImpl(LOGICAL_OR_EXPRESSION)
7-
SpELLogicalAndExpressionImpl(LOGICAL_AND_EXPRESSION)
8-
SpELEqualityExpressionImpl(EQUALITY_EXPRESSION)
9-
SpELRelationalExpressionImpl(RELATIONAL_EXPRESSION)
10-
SpELAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
11-
SpELMultiplicativeExpressionImpl(MULTIPLICATIVE_EXPRESSION)
12-
SpELPowerExpressionImpl(POWER_EXPRESSION)
13-
SpELUnaryExpressionImpl(UNARY_EXPRESSION)
14-
SpELPostfixExpressionImpl(POSTFIX_EXPRESSION)
15-
SpELConstructorCallImpl(CONSTRUCTOR_CALL)
16-
PsiElement(new)('new')
17-
PsiWhiteSpace(' ')
18-
SpELQualifiedNameImpl(QUALIFIED_NAME)
19-
PsiElement(IDENTIFIER)('java')
20-
PsiElement(.)('.')
21-
PsiElement(IDENTIFIER)('util')
22-
PsiElement(.)('.')
23-
PsiElement(IDENTIFIER)('Date')
24-
PsiElement(()('(')
25-
PsiElement())(')')
2+
SpELNewExpressionImpl(NEW_EXPRESSION)
3+
PsiElement(NEW)('new')
4+
PsiWhiteSpace(' ')
5+
SpELQualifiedNameImpl(QUALIFIED_NAME)
6+
PsiElement(IDENTIFIER)('java')
7+
PsiElement(.)('.')
8+
PsiElement(IDENTIFIER)('util')
9+
PsiElement(.)('.')
10+
PsiElement(IDENTIFIER)('Date')
11+
SpELExpressionListImpl(EXPRESSION_LIST)
12+
PsiElement(()('(')
13+
PsiElement())(')')

0 commit comments

Comments
 (0)