213246 - decouple org.eclipse.wst.javascript from org.eclipse.jst.jsp
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 2074ec2..be245f8 100644
--- a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -57,7 +57,6 @@
org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.javascript.ui;bundle-version="[1.0.0,1.1.0)",
org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java
index 7fa507e..75448b4 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java
@@ -49,8 +49,8 @@
import org.eclipse.wst.html.core.internal.contentmodel.JSPCMDocument;
import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
import org.eclipse.wst.html.core.text.IHTMLPartitions;
+import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
import org.eclipse.wst.html.ui.internal.contentassist.HTMLContentAssistProcessor;
-import org.eclipse.wst.javascript.ui.internal.common.contentassist.JavaScriptContentAssistProcessor;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
@@ -118,6 +118,7 @@
private final ICompletionProposal[] EMPTY_PROPOSAL_SET = new ICompletionProposal[0];
private JSPTemplateCompletionProcessor fTemplateProcessor = null;
private List fTemplateContexts = new ArrayList();
+ private IContentAssistProcessor fJSContentAssistProcessor;
public JSPContentAssistProcessor() {
super();
@@ -147,7 +148,7 @@
HTMLContentAssistProcessor htmlProcessor = new HTMLContentAssistProcessor();
JSPJavaContentAssistProcessor jspJavaProcessor = new JSPJavaContentAssistProcessor();
XMLContentAssistProcessor xmlProcessor = new XMLContentAssistProcessor();
- JavaScriptContentAssistProcessor javascriptProcessor = new JavaScriptContentAssistProcessor();
+ IContentAssistProcessor javascriptProcessor = getJSContentAssistProcessor();
fPartitionToProcessorMap.put(IHTMLPartitions.HTML_DEFAULT, htmlProcessor);
fPartitionToProcessorMap.put(IXMLPartitions.XML_DEFAULT, xmlProcessor);
@@ -155,9 +156,11 @@
fPartitionToProcessorMap.put(IJSPPartitions.JSP_DEFAULT, jspJavaProcessor);
fPartitionToProcessorMap.put(IJSPPartitions.JSP_DIRECTIVE, xmlProcessor);
fPartitionToProcessorMap.put(IHTMLPartitions.HTML_COMMENT, htmlProcessor);
- fPartitionToProcessorMap.put(IJSPPartitions.JSP_CONTENT_JAVASCRIPT, javascriptProcessor);
fPartitionToProcessorMap.put(IJSPPartitions.JSP_DEFAULT_EL, jspJavaProcessor);
- fPartitionToProcessorMap.put(IHTMLPartitions.SCRIPT, javascriptProcessor); // default
+ if (javascriptProcessor != null) {
+ fPartitionToProcessorMap.put(IJSPPartitions.JSP_CONTENT_JAVASCRIPT, javascriptProcessor);
+ fPartitionToProcessorMap.put(IHTMLPartitions.SCRIPT, javascriptProcessor); // default
+ }
// to
// javascript
// for
@@ -898,7 +901,7 @@
// fix for:
// HTML content assist give JSP tags in between empty script tags
- if (!(p instanceof JavaScriptContentAssistProcessor || p instanceof CSSContentAssistProcessor)) {
+ if (!((getJSContentAssistProcessor() != null && getJSContentAssistProcessor().getClass().isInstance(p)) || p instanceof CSSContentAssistProcessor)) {
fTemplateContexts.clear();
jspResults = super.computeCompletionProposals(viewer, documentPosition);
}
@@ -993,6 +996,13 @@
return (ICompletionProposal[]) results.toArray(new ICompletionProposal[results.size()]);
}
+ private IContentAssistProcessor getJSContentAssistProcessor() {
+ if (fJSContentAssistProcessor == null) {
+ fJSContentAssistProcessor = new StructuredTextViewerConfigurationHTML().getContentAssistant(null).getContentAssistProcessor(IHTMLPartitions.SCRIPT);
+ }
+ return fJSContentAssistProcessor;
+ }
+
/*
* This method will return JSPJava Proposals that are relevant to any java
* beans that in scope at the documentPosition
