Author: scabanovich
Date: 2011-04-14 17:47:40 -0400 (Thu, 14 Apr 2011)
New Revision: 30582
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/LexicalToken.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java
Log:
JBIDE-8728
https://issues.jboss.org/browse/JBIDE-8728
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/LexicalToken.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/LexicalToken.java 2011-04-14
21:41:11 UTC (rev 30581)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/LexicalToken.java 2011-04-14
21:47:40 UTC (rev 30582)
@@ -100,6 +100,10 @@
return type;
}
+ public void setType(int type) {
+ this.type = type;
+ }
+
/*
* Returns the token text
*/
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2011-04-14
21:41:11 UTC (rev 30581)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2011-04-14
21:47:40 UTC (rev 30582)
@@ -180,6 +180,16 @@
setNextToken();
return expr;
case JavaNameTokenDescription.JAVA_NAME:
+ LexicalToken t = lookUpNextToken(current);
+ if(t != null && t.getType() == OperationTokenDescription.OPERATION &&
t.getText().equals(":")) { //$NON-NLS-1$
+ LexicalToken t1 = lookUpNextToken(t);
+ if(t1 != null && t1.getType() == JavaNameTokenDescription.JAVA_NAME) {
+ LexicalToken t2 = lookUpNextToken(t1);
+ if(t2 != null && t2.getType() == ParamStartTokenDescription.PARAM_START) {
+ t.setType(DotTokenDescription.DOT);
+ }
+ }
+ }
return readInvocationExpression();
}
return null;