Author: akazakov
Date: 2009-11-05 13:46:22 -0500 (Thu, 05 Nov 2009)
New Revision: 18424
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5151
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-11-05
17:32:49 UTC (rev 18423)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-11-05
18:46:22 UTC (rev 18424)
@@ -235,6 +235,7 @@
int startSuffix = var.getElToken().getText().length();
int endSuffix = startSuffix + suffix.length();
ELSegment firstSegment = null;
+ boolean sufixIsNotResolved = false;
for (ELSegment segment : newSegments) {
int startPosition = segment.getToken().getStart();
if(startPosition>=endSuffix) {
@@ -242,8 +243,12 @@
nextOriginalToken =
nextOriginalToken.findTokenForward(JavaNameTokenDescription.JAVA_NAME);
((ELSegmentImpl)segment).setToken(nextOriginalToken);
} else {
+ if(!sufixIsNotResolved) {
+ sufixIsNotResolved = !segment.isResolved();
+ }
firstSegment = segment;
((ELSegmentImpl)firstSegment).setToken(firstOriginalToken);
+ ((ELSegmentImpl)firstSegment).setResolved(!sufixIsNotResolved);
// if(firstSegment instanceof JavaMemberELSegmentImpl) {
// JavaMemberELSegmentImpl javaSegment = (JavaMemberELSegmentImpl) firstSegment;
// MemberInfo m = javaSegment.getMemberInfo();