Author: vrubezhny Date: 2008-01-18 06:19:11 -0500 (Fri, 18 Jan 2008) New Revision: 5795 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java Log: JBIDE-1648 Content Assist falls with NullPointerException Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2008-01-18 10:56:03 UTC (rev 5794) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2008-01-18 11:19:11 UTC (rev 5795) @@ -550,7 +550,7 @@ */ public IStructuredDocumentRegion getStructuredDocumentRegion(int pos) { IStructuredDocumentRegion sdRegion = ContentAssistUtils.getStructuredDocumentRegion(fTextViewer, pos); - ITextRegion region = sdRegion.getRegionAtCharacterOffset(pos); + ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(pos)); if (region == null) { return null; } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2008-01-18 10:56:03 UTC (rev 5794) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2008-01-18 11:19:11 UTC (rev 5795) @@ -629,7 +629,7 @@ */ public IStructuredDocumentRegion getStructuredDocumentRegion(int pos) { IStructuredDocumentRegion sdRegion = ContentAssistUtils.getStructuredDocumentRegion(fTextViewer, pos); - ITextRegion region = sdRegion.getRegionAtCharacterOffset(pos); + ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(pos)); if (region == null) { return null; }