#238833 include/imports
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java
index 14df81b..93b4401 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java
@@ -27,7 +27,6 @@
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xsl.core.XSLCore;
import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
@@ -136,8 +135,6 @@
String text = getText();
String precedingText;
-
-
int length = getCursorPosition()-getStartOffset();
if (length > 0 && text.length() > length + 1)
precedingText = text.substring(1,length);
@@ -145,7 +142,7 @@
precedingText = "";
IFile editorFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getLocation()));
editorFile.getProject().accept(new XSLFileResourceVisitor(editorFile,precedingText));
-
+
Collections.sort(pathList,new PathComparator());
for (IPath path : pathList)
{
@@ -153,13 +150,14 @@
CustomCompletionProposal proposal = new CustomCompletionProposal(
pathString,
getStartOffset() + 1,
- 0,
+ text.length()-2,
pathString.length(),
XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_XSL_FILE),
pathString,
null,
null,
- 0
+ 0,
+ true
);
proposals.add(proposal);
}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java
index 6c473ce..5dfa44b 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java
@@ -124,6 +124,6 @@
protected boolean hasAttributeAtTextRegion(String attrName, NamedNodeMap nodeMap, ITextRegion aRegion) {
IDOMAttr attrNode = (IDOMAttr) nodeMap.getNamedItem(attrName);
- return attrNode != null && attrNode.getValueRegion().getStart() == aRegion.getStart();
+ return attrNode != null && attrNode.getValueRegion() != null && attrNode.getValueRegion().getStart() == aRegion.getStart();
}
}