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

[jbosstools-commits at lists.jboss.org]

Author: vrubezhny
Date: 2012-09-19 09:33:53 -0400 (Wed, 19 Sep 2012)
New Revision: 43827

Modified:
   trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
Log:
JBIDE-12630
EL Resolver incorrectly processes EL which uses java.util.Map 

Issue is fixed

Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java	2012-09-19 11:18:12 UTC (rev 43826)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java	2012-09-19 13:33:53 UTC (rev 43827)
@@ -706,12 +706,14 @@
 					} else {
 						members = resolveSegment(left, members, resolution, returnEqualedVariablesOnly, varIsUsed, segment);
 					}
-					if(!members.isEmpty()) {
-						segment.setResolved(true);
-						segment.setMemberInfo(members.get(0));	// TODO: This is a buggy way to select a member to setup in a segment
+					if(!skipSegment) { // Do not store any members if the segment is 'skipped' because it's already resolved.
+						if (!members.isEmpty()) {
+							segment.setResolved(true);
+							segment.setMemberInfo(members.get(0));	// TODO: This is a buggy way to select a member to setup in a segment
+						}
+
+						resolution.addSegment(segment);
 					}
-					if (!skipSegment)
-						resolution.addSegment(segment);
 				} else { // Last segment
 					resolveLastSegment((ELInvocationExpression)operand, members, resolution, returnEqualedVariablesOnly, varIsUsed);
 					break;