commit | d397a3f157568df581fd07b6fc7d1593b7d846a0 | [log] [tgz] |
---|---|---|
author | nitind <nitind> | Wed Sep 29 06:45:23 2010 +0000 |
committer | nitind <nitind> | Wed Sep 29 06:45:23 2010 +0000 |
tree | 710ed616c448b3ac022111b44c1b5f31e6adee91 | |
parent | 94f09181f53ed55d9b4e049fbf87a2bff777cdd1 [diff] |
[326062] No content assist in attribute-embedded scriptlets
diff --git a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF index aa7bc77..68bc1fb 100644 --- a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.jsp.ui; singleton:=true -Bundle-Version: 1.1.501.qualifier +Bundle-Version: 1.1.502.qualifier Bundle-Activator: org.eclipse.jst.jsp.ui.internal.JSPUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaCompletionProposalComputer.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaCompletionProposalComputer.java index 27364a4..546dc13 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaCompletionProposalComputer.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaCompletionProposalComputer.java
@@ -341,6 +341,8 @@ int documentPosition = context.getInvocationOffset(); String partitionType = getPartitionType(viewer, documentPosition); + if (partitionType == IJSPPartitions.JSP_CONTENT_JAVA) + return true; IStructuredDocument structuredDocument = (IStructuredDocument) viewer.getDocument(); IStructuredDocumentRegion fn = structuredDocument.getRegionAtCharacterOffset(documentPosition); IStructuredDocumentRegion sdRegion = ContentAssistUtils.getStructuredDocumentRegion(viewer, documentPosition);