Author: dazarov Date: 2010-04-30 10:55:55 -0400 (Fri, 30 Apr 2010) New Revision: 21831 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-6179 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2010-04-30 14:32:07 UTC (rev 21830) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2010-04-30 14:55:55 UTC (rev 21831) @@ -82,6 +82,7 @@ private IHyperlinkRegion getRegion(IDocument document, final int offset) { jspExpression = false; + dotExpression = false; ELContext context = getELContext(document); if(context != null){ ExpressionStructure eStructure = getExpression(context, offset); @@ -94,7 +95,7 @@ return region; } } - dotExpression = checkDot(document, offset, context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition(), offset); + dotExpression = checkDot(document, offset, context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition()); IHyperlinkRegion region = new HyperlinkRegion(eStructure.expression.getStartPosition(), eStructure.expression.getLength(), null, null, null); return region; @@ -158,13 +159,13 @@ return false; } - public boolean checkDot(IDocument document, int superOffset, ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset, int globalOffset){ + public boolean checkDot(IDocument document, int superOffset, ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset){ try{ String text = document.get(superOffset, 1); if(DOT.equals(text)){ - if(decide(context, expression, invocationExpression, offset+1, globalOffset)) + if(decide(context, expression, invocationExpression, offset+1, superOffset+1)) return true; - else if(decide(context, expression, invocationExpression, offset-1, globalOffset)) + else if(decide(context, expression, invocationExpression, offset-1, superOffset-1)) return true; } }catch(BadLocationException ex){ Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx 2010-04-30 14:32:07 UTC (rev 21830) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx 2010-04-30 14:55:55 UTC (rev 21831) @@ -2,6 +2,7 @@ <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich" xmlns="http://www.w3.org/1999/xhtml" version="2.0"> <jsp:output doctype-root-element="html" @@ -20,6 +21,9 @@ <h:outputText value="#{Message.info_start}" /><h:outputText value="#{numberGuess.remainingGuesses}"/><h:outputText value="#{Message.info_finish}" /> <h:commandButton value="#{Message.button_yes}" action="yes"/> <h:commandButton value="#{Message.button_no}" action="no"/> + <rich:dataTable value="#{numberGuess.possibilities}" var="_localVariable"> + <h:outputText value="#{_localVariable.intValue}" /> + </rich:dataTable> </h:form> </f:view> </body> Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-04-30 14:32:07 UTC (rev 21830) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-04-30 14:55:55 UTC (rev 21831) @@ -118,38 +118,30 @@ HashMap<Object, ArrayList<Region>> recognitionTest = new HashMap<Object, ArrayList<Region>>(); ArrayList<Region> regionList = new ArrayList<Region>(); - regionList.add(new Region(623, 16)); - regionList.add(new Region(706, 16)); - regionList.add(new Region(813, 18)); - regionList.add(new Region(914, 19)); - regionList.add(new Region(972, 18)); - regionList.add(new Region(1041, 17)); + regionList.add(new Region(673, 7)); + regionList.add(new Region(680, 9)); + regionList.add(new Region(756, 7)); + regionList.add(new Region(763, 9)); + regionList.add(new Region(863, 7)); + regionList.add(new Region(870, 11)); + regionList.add(new Region(964, 19)); + regionList.add(new Region(1022, 18)); + regionList.add(new Region(1091, 17)); recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE", regionList); regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BEAN", regionList); + regionList.add(new Region(920, 1)); + regionList.add(new Region(1168, 1)); + regionList.add(new Region(1251, 1)); + recognitionTest.put("org.jboss.tools.common.text.ext.jsp.DOT_EXPRESSION", regionList); regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); - recognitionTest.put("org.jboss.tools.seam.text.ext.SEAM_BEAN", regionList); - - regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(870, 16)); - regionList.add(new Region(886, 1)); - - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION", regionList); - -// regionList = new ArrayList<Region>(); -// regionList.add(new Region(870, 16)); -// recognitionTest.put("org.eclipse.jst.jsp.SCRIPT.JSP_EL2", regionList); - - regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); + regionList.add(new Region(909, 11)); + regionList.add(new Region(921, 16)); + regionList.add(new Region(1157, 11)); + regionList.add(new Region(1169, 13)); + regionList.add(new Region(1237, 14)); + regionList.add(new Region(1252, 8)); recognitionTest.put("org.jboss.tools.common.text.ext.jsp.EXPRESSION", regionList); int counter = 0; @@ -216,7 +208,7 @@ } } - assertEquals("Wrong recognized region count: ", 132, counter); + assertEquals("Wrong recognized region count: ", 180, counter); model.releaseFromEdit(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2010-04-30 14:32:07 UTC (rev 21830) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2010-04-30 14:55:55 UTC (rev 21831) @@ -17,7 +17,7 @@ public static Test suite() { TestSuite suite = new TestSuite(JsfTextExtAllTests.class.getName()); - //suite.addTest(ELExprPartitionerTest.suite()); + suite.addTest(ELExprPartitionerTest.suite()); return suite; } } \ No newline at end of file