Removed one formating hack-fix, added extension support for the new extension in WST 3. NOTE - These changes will disable other 'hacks' necisary for JSDT to hook into WST2 and thus break WST 2.0 JSDT support.
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties index b9f8ac3..ee6c00d 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties +++ b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties
@@ -68,4 +68,5 @@ renameParticipant.name.3 = JSDT Web Rename Participant menu.label.5 = Web Development Tools action.label.21 = Add JavaScript Support -queryParticipant.name.0 = JavaScript Query Participant \ No newline at end of file +queryParticipant.name.0 = JavaScript Query Participant +hyperlinkDetector.name.2 = JSDT HyperLink Detector \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml index 8c71c41..7f988fb 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml +++ b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
@@ -4,51 +4,69 @@ <extension point="org.eclipse.wst.sse.ui.editorConfiguration"> + <!-- <sourceViewerConfiguration class="org.eclipse.wst.jsdt.web.ui.StructuredTextViewerConfigurationJSDT" target="org.eclipse.wst.html.core.htmlsource.source" /> + --> <contentOutlineConfiguration class="org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JsContentOutlineConfig" target="org.eclipse.wst.html.core.htmlsource.source" /> - - <!-- <provisionalConfiguration type="contentassistprocessor" class="org.eclipse.wst.jsdt.web.ui.internal.contentassist.JSDTContentAssistant" - target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" /> - --> + target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" /> + <provisionalConfiguration type="linestyleprovider" class="org.eclipse.wst.jsdt.web.ui.internal.style.java.LineStyleProviderForJSDT" - target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" /> - <provisionalConfiguration - type="texthover" + target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" /> + <documentationTextHover class="org.eclipse.wst.jsdt.web.ui.internal.taginfo.JSDTHoverProcessor" - target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" /> + target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" /> + <!-- Not sure on information provider extension --> <provisionalConfiguration type="informationpresenter" class="org.eclipse.wst.jsdt.web.ui.internal.taginfo.JSDTInformationProvider" - target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" /> + target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" /> + <provisionalConfiguration type="characterpairmatcher" class="org.eclipse.wst.jsdt.web.ui.internal.text.JsDocumentRegionEdgeMatcher" - target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" /> + target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" /> <provisionalConfiguration type="autoeditstrategy" class="org.eclipse.wst.jsdt.web.ui.internal.autoedit.AutoEditStrategyForJs" - target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" /> + target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" /> <provisionalConfiguration - type="contentformater" + type="slaveformattingstrategy" class="org.eclipse.wst.jsdt.web.ui.internal.format.FormattingStrategyJSDT" target="org.eclipse.wst.html.SCRIPT" /> + <!-- <provisionalConfiguration type="hyperlinkdetector" class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector" target="org.eclipse.wst.html.SCRIPT" /> + + --> </extension> + + <extension + point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> + <hyperlinkDetector + class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector" + id="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector" + name="%hyperlinkDetector.name.2" + targetId="org.eclipse.wst.html.core.htmlsource"> + </hyperlinkDetector> + + </extension> + + + <extension point = "org.eclipse.wst.sse.ui.extendedEditorActions"> <editorContribution targetID="com.ibm.sse.editor.StructuredTextEditor" @@ -74,7 +92,7 @@ <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets"> <target - id="org.eclipse.wst.html.SCRIPT.EVENT" + id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER" name="%target.name.1"> </target> </extension> @@ -91,7 +109,7 @@ class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector" id="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.script.event.JSPJavaHyperlinkDetector" name="%hyperlinkDetector.name.1" - targetId="org.eclipse.wst.html.SCRIPT.EVENT"> + targetId="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"> </hyperlinkDetector> </extension> @@ -359,7 +377,7 @@ id="org.eclipse.wst.jsdt.web.jspsourcevalidator"> <contentTypeIdentifier id="org.eclipse.wst.html.core.htmlsource"> <partitionType id="org.eclipse.wst.html.SCRIPT"></partitionType> - <partitionType id="org.eclipse.wst.html.SCRIPT.EVENT"></partitionType> + <partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"></partitionType> </contentTypeIdentifier> </validator>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java index c5d1bcd..8171846 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java +++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
@@ -95,7 +95,7 @@ * */ document.replaceText(document, partition.getOffset(), partition.getLength(), replaceText); - document.addDocumentPartitioningListener(new ModelIrritant(document)); + // document.addDocumentPartitioningListener(new ModelIrritant(document)); } } catch (BadLocationException e) { } catch (JavaModelException e) {