[jbosstools-commits] JBoss Tools SVN: r30612 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-04-15 17:45:59 -0400 (Fri, 15 Apr 2011)
New Revision: 30612

Modified:
   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/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-15 20:56:22 UTC (rev 30611)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java	2011-04-15 21:45:59 UTC (rev 30612)
@@ -189,6 +189,11 @@
 						LexicalToken t2 = lookUpNextToken(t1);
 						if(t2 != null && t2.getType() == ParamStartTokenDescription.PARAM_START) {
 							t.setType(DotTokenDescription.DOT);
+						} else {
+							LexicalToken t_ = lookUpPrevToken(current);
+							if(t_ == null || !"?".equals(t_.getText())) { //$NON-NLS-1$
+								t.setType(DotTokenDescription.DOT);
+							}
 						}
 					}
 				}
@@ -367,6 +372,17 @@
 		return c;
 	}
 
+	private LexicalToken lookUpPrevToken(LexicalToken token) {
+		LexicalToken c = token;
+		while(c != null 
+				&& (c == token 
+					|| c.getType() == WhiteSpaceTokenDescription.WHITESPACE
+					|| c.getType() == Tokenizer.LITERAL)) {
+			c = c.getPreviousToken();
+		}
+		return c;
+	}
+
 	private void setNextToken() {
 		current = lookUpNextToken(current);
 	}