Author: scabanovich
Date: 2012-04-24 17:05:34 -0400 (Tue, 24 Apr 2012)
New Revision: 40459
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Case #{a['b'].c|} is fixed.
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-04-24
21:03:58 UTC (rev 40458)
+++
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-04-24
21:05:34 UTC (rev 40459)
@@ -644,7 +644,8 @@
if (string.indexOf('\'') != -1 &&
restOfEL.indexOf('\'') != -1) // Exclude last quote if this char already
exists
string = string.substring(0, string.lastIndexOf('\''));
- if ((string.indexOf('[') != -1 || prefix.indexOf('[') != -1)
&& string.indexOf(']') == -1 && restOfEL.indexOf(']') ==
-1) // Add closing square bracket if needed
+ if ((string.indexOf('[') != -1 || (prefix.indexOf('[') != -1
&& prefix.indexOf(']', prefix.lastIndexOf('[')) == -1))
+ && string.indexOf(']') == -1 &&
restOfEL.indexOf(']') == -1) // Add closing square bracket if needed
string += ']';
string += proposalSufix;