Author: scabanovich Date: 2012-04-23 19:27:40 -0400 (Mon, 23 Apr 2012) New Revision: 40431 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java Log: JBIDE-11510 https://issues.jboss.org/browse/JBIDE-11510 Case #{a[|]} 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-04-23 23:24:18 UTC (rev 40430) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-04-23 23:27:40 UTC (rev 40431) @@ -29,12 +29,14 @@ import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.el.core.ELCorePlugin; import org.jboss.tools.common.el.core.ELReference; +import org.jboss.tools.common.el.core.model.ELArgument; import org.jboss.tools.common.el.core.model.ELArgumentInvocation; import org.jboss.tools.common.el.core.model.ELExpression; import org.jboss.tools.common.el.core.model.ELInstance; import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.model.ELMethodInvocation; import org.jboss.tools.common.el.core.model.ELModel; +import org.jboss.tools.common.el.core.model.ELObject; import org.jboss.tools.common.el.core.model.ELObjectType; import org.jboss.tools.common.el.core.model.ELPropertyInvocation; import org.jboss.tools.common.el.core.model.ELUtil; @@ -1023,7 +1025,12 @@ if(!proposalsToFilter.isEmpty()) { resolution.addSegment(segment); if(expr instanceof ELArgumentInvocation) { - segment.setToken(((ELArgumentInvocation)expr).getArgument().getArgument().getFirstToken()); + ELArgument a = ((ELArgumentInvocation)expr).getArgument(); + if(a.getArgument() == null) { + segment.setToken(((ELObject)a).getFirstToken()); + } else { + segment.setToken(a.getArgument().getFirstToken()); + } } }