Author: akazakov Date: 2008-02-22 04:49:46 -0500 (Fri, 22 Feb 2008) New Revision: 6521 Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java trunk/common/tests/org.jboss.tools.common.kb.test/src/org/jboss/tools/common/kb/test/KbQueriesTest.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java Log: http://jira.jboss.org/jira/browse/JBIDE-1810 Fixed Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java 2008-02-22 08:59:34 UTC (rev 6520) +++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java 2008-02-22 09:49:46 UTC (rev 6521) @@ -271,6 +271,10 @@ return getTags(needResources, prefixName, tagName, tagMask); } + if(startAttributeName<startTagName) { + return new ArrayList<KbProposal>(); + } + String tagName = strQuery.substring(startTagName, startAttributeName); startAttributeName+=KbQuery.ATTRIBUTE_SEPARATOR.length(); if(startAttributeName == strQuery.length()) { Modified: trunk/common/tests/org.jboss.tools.common.kb.test/src/org/jboss/tools/common/kb/test/KbQueriesTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.kb.test/src/org/jboss/tools/common/kb/test/KbQueriesTest.java 2008-02-22 08:59:34 UTC (rev 6520) +++ trunk/common/tests/org.jboss.tools.common.kb.test/src/org/jboss/tools/common/kb/test/KbQueriesTest.java 2008-02-22 09:49:46 UTC (rev 6521) @@ -39,6 +39,18 @@ private JspWtpKbConnector connector = new JspWtpKbConnector(); /** + * Test for http://jira.jboss.com/jira/browse/JBIDE-1810 + */ + public void testJBIDE1810() { + String query = KbQuery.TAG_SEPARATOR + "html@xmlns:"; + try { + connector.getProposals(query); + } catch (KbException e) { + fail("Fails during parsing query for \"xmlns\" attribute: " + e.getMessage()); + } + } + + /** * Test for http://jira.jboss.com/jira/browse/JBIDE-1804 */ public void testJBIDE1804() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-02-22 08:59:34 UTC (rev 6520) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-02-22 09:49:46 UTC (rev 6521) @@ -250,25 +250,27 @@ } catch(Exception e) { JspEditorPlugin.getPluginLog().logError(e); } - for (Iterator iter = kbProposals.iterator(); iter.hasNext();) { - KbProposal kbProposal = cleanFaceletProposal((KbProposal)iter.next()); - String proposedInfo = kbProposal.getContextInfo(); - String replacementString = kbProposal.getReplacementString() + "=\"\""; - String displayString = kbProposal.getLabel(); - AttrImpl attr = (AttrImpl)attributes.getNamedItem(displayString); - if(attr!=null) { - ITextRegion region = attr.getNameRegion(); - IStructuredDocumentRegion docRegion = contentAssistRequest.getDocumentRegion(); - if(docRegion.getStartOffset(region)>contentAssistRequest.getReplacementBeginPosition() || - docRegion.getEndOffset(region)< contentAssistRequest.getReplacementBeginPosition() + contentAssistRequest.getReplacementLength()) { - continue; + if(kbProposals!=null) { + for (Iterator iter = kbProposals.iterator(); iter.hasNext();) { + KbProposal kbProposal = cleanFaceletProposal((KbProposal)iter.next()); + String proposedInfo = kbProposal.getContextInfo(); + String replacementString = kbProposal.getReplacementString() + "=\"\""; + String displayString = kbProposal.getLabel(); + AttrImpl attr = (AttrImpl)attributes.getNamedItem(displayString); + if(attr!=null) { + ITextRegion region = attr.getNameRegion(); + IStructuredDocumentRegion docRegion = contentAssistRequest.getDocumentRegion(); + if(docRegion.getStartOffset(region)>contentAssistRequest.getReplacementBeginPosition() || + docRegion.getEndOffset(region)< contentAssistRequest.getReplacementBeginPosition() + contentAssistRequest.getReplacementLength()) { + continue; + } } + boolean autoContentAssistant = true; + int cursorAdjustment = replacementString.length() - 1; + Image image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(autoContentAssistant, replacementString, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), cursorAdjustment, image, displayString, null, proposedInfo, XMLRelevanceConstants.R_TAG_NAME); + contentAssistRequest.addProposal(proposal); } - boolean autoContentAssistant = true; - int cursorAdjustment = replacementString.length() - 1; - Image image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE); - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(autoContentAssistant, replacementString, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), cursorAdjustment, image, displayString, null, proposedInfo, XMLRelevanceConstants.R_TAG_NAME); - contentAssistRequest.addProposal(proposal); } addJsfAttributeNameProposalsForFaceletTag(contentAssistRequest); super.addAttributeNameProposals(contentAssistRequest);