[208820] extensible autoedit and doubleclick

10 files changed, 120 insertions, 41 deletions

diff --git a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
index 0db4da127f..3ed6c614a1 100644
--- a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.2.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.css.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.xml b/bundles/org.eclipse.wst.css.ui/plugin.xml
index 4593910b56..359da52750 100644
--- a/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.css.ui/plugin.xml
@@ -33,6 +33,10 @@
 			type="structuredtextfoldingprovider"
 			class="org.eclipse.wst.css.ui.internal.projection.StructuredTextFoldingProviderCSS"
 			target="org.eclipse.wst.css.core.csssource" />
+		<provisionalConfiguration
+			type="autoeditstrategy"
+			class="org.eclipse.wst.css.ui.internal.autoedit.StructuredAutoEditStrategyCSS"
+			target="org.eclipse.wst.css.STYLE" />
 		<provisionalDefinition
 			type="preferencepages"
 			value="org.eclipse.wst.sse.ui.preferences.css, org.eclipse.wst.sse.ui.preferences.css.source, org.eclipse.wst.css.ui.preferences.templates, org.eclipse.wst.sse.ui.preferences.css.styles"
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java
index 119291399e..c932d49582 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,7 +24,6 @@ import org.eclipse.wst.css.core.internal.CSSCorePlugin;
 import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
 import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
 import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.css.ui.internal.autoedit.StructuredAutoEditStrategyCSS;
 import org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor;
 import org.eclipse.wst.css.ui.internal.style.LineStyleProviderForCSS;
 import org.eclipse.wst.sse.core.text.IStructuredPartitions;
@@ -69,10 +68,6 @@ public class StructuredTextViewerConfigurationCSS extends StructuredTextViewerCo
 			allStrategies.add(superStrategies[i]);
 		}
 
-		if (contentType == ICSSPartitions.STYLE) {
-			allStrategies.add(new StructuredAutoEditStrategyCSS());
-		}
-
 		return (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[0]);
 	}
 
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 0766e2084d..02aa11921d 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -46,6 +46,10 @@
 			type="org.eclipse.jface.text.quickassist.IQuickAssistProcessor"
 			class="org.eclipse.wst.xml.ui.internal.correction.XMLQuickAssistProcessor"
 			target="org.eclipse.wst.html.HTML_DEFAULT" />
+		<provisionalConfiguration
+			type="autoeditstrategy"
+			class="org.eclipse.wst.html.ui.internal.autoedit.StructuredAutoEditStrategyHTML"
+			target="org.eclipse.wst.html.HTML_DEFAULT, org.eclipse.wst.html.HTML_DECLARATION" />
 		<provisionalDefinition
 			type="preferencepages"
 			value="org.eclipse.wst.html.ui.preferences, org.eclipse.wst.html.ui.preferences.source, org.eclipse.wst.html.ui.preferences.templates, org.eclipse.wst.html.ui.preferences.styles"
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java
index 0f2ba1c702..feafd8d274 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java
@@ -34,7 +34,6 @@ import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdF
 import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
 import org.eclipse.wst.html.core.text.IHTMLPartitions;
 import org.eclipse.wst.html.ui.internal.autoedit.AutoEditStrategyForTabs;
-import org.eclipse.wst.html.ui.internal.autoedit.StructuredAutoEditStrategyHTML;
 import org.eclipse.wst.html.ui.internal.contentassist.HTMLContentAssistProcessor;
 import org.eclipse.wst.html.ui.internal.contentassist.NoRegionContentAssistProcessorForHTML;
 import org.eclipse.wst.html.ui.internal.style.LineStyleProviderForHTML;
@@ -95,10 +94,6 @@ public class StructuredTextViewerConfigurationHTML extends StructuredTextViewerC
 			allStrategies.add(superStrategies[i]);
 		}
 
-		if (contentType == IHTMLPartitions.HTML_DEFAULT || contentType == IHTMLPartitions.HTML_DECLARATION) {
-			allStrategies.add(new StructuredAutoEditStrategyHTML());
-		}
-
 		// be sure this is added last in list, so it has a change to modify
 		// previous results.
 		// add auto edit strategy that handles when tab key is pressed
diff --git a/bundles/org.eclipse.wst.sse.ui/schema/editorconfiguration.exsd b/bundles/org.eclipse.wst.sse.ui/schema/editorconfiguration.exsd
index 45c2bef413..250fec604c 100644
--- a/bundles/org.eclipse.wst.sse.ui/schema/editorconfiguration.exsd
+++ b/bundles/org.eclipse.wst.sse.ui/schema/editorconfiguration.exsd
@@ -17,6 +17,7 @@
             <element ref="contentOutlineConfiguration" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="propertySheetConfiguration" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="documentationTextHover" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="doubleClickStrategy" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="provisionalConfiguration" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="provisionalDefinition" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
@@ -128,7 +129,7 @@
    <element name="documentationTextHover">
       <annotation>
          <documentation>
-            Defines the text hover processor to use to display documentation information in a text hover
+            Defines the text hover processor to use to display documentation information in a text hover. Note, in the event more than one documentation text hover is contributed for the same target partition type, the first one loaded will be the one used and all other contributions will be ignored.
 &lt;br /&gt;
 &lt;i&gt;Since 3.0&lt;/i&gt;
          </documentation>
@@ -154,6 +155,35 @@
       </complexType>
    </element>
 
+   <element name="doubleClickStrategy">
+      <annotation>
+         <documentation>
+            Defines the doubleclick strategy to use when the user performs a mouse doubleclick.  Note, in the event more than one doubleclick strategy is contributed for the same target partition type, the first one loaded will be the one used and all other contributions will be ignored.
+&lt;br /&gt;
+&lt;i&gt;Since 3.0&lt;/i&gt;
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="target" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A string defining when to use this extension.  Must be a partition type id.  Multiple targets may be given as a comma delimited value.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Must implement org.eclipse.jface.text.ITextDoubleClickStrategy
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.text.ITextDoubleClickStrategy"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
    <element name="provisionalConfiguration">
       <annotation>
          <documentation>
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
index 3b39582ab4..780f076738 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
@@ -12,11 +12,16 @@
  *******************************************************************************/
 package org.eclipse.wst.sse.ui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IAutoEditStrategy;
 import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.ITextDoubleClickStrategy;
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.IUndoManager;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
@@ -88,6 +93,11 @@ public class StructuredTextViewerConfiguration extends TextSourceViewerConfigura
 	 * One instance per configuration
 	 */
 	private IReconciler fReconciler;
+	/**
+	 * Extended configuration provisionalConfiguration type to contribute
+	 * additional auto edit strategies
+	 */
+	private final String AUTOEDITSTRATEGY = "autoeditstrategy";
 
 
 	/**
@@ -144,6 +154,23 @@ public class StructuredTextViewerConfiguration extends TextSourceViewerConfigura
 		return EditorUtility.getColor(rgb);
 	}
 
+	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
+		List allStrategies = new ArrayList(0);
+
+		IAutoEditStrategy[] superStrategies = super.getAutoEditStrategies(sourceViewer, contentType);
+		for (int i = 0; i < superStrategies.length; i++) {
+			allStrategies.add(superStrategies[i]);
+		}
+
+		// add auto edit strategies contributed by clients
+		List extendedAutoEdits = ExtendedConfigurationBuilder.getInstance().getConfigurations(AUTOEDITSTRATEGY, contentType);
+		if (!extendedAutoEdits.isEmpty()) {
+			allStrategies.addAll(extendedAutoEdits);
+		}
+
+		return (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[allStrategies.size()]);
+	}
+
 	/**
 	 * Returns the configured partitioning for the given source viewer. The
 	 * partitioning is used when the querying content types from the source
@@ -295,6 +322,34 @@ public class StructuredTextViewerConfiguration extends TextSourceViewerConfigura
 	}
 
 	/**
+	 * Returns the double-click strategy ready to be used in this viewer when
+	 * double clicking onto text of the given content type. Note that if
+	 * clients want to contribute their own doubleclick strategy, they should
+	 * use <code>org.eclipse.wst.sse.ui.editorConfiguration</code> extension
+	 * point's <code>doubleClickStrategy</code> element instead of
+	 * overriding this method. If clients do override this method, please
+	 * remember to call <code>super.getDoubleClickStrategy()</code>.
+	 * 
+	 * @param sourceViewer
+	 *            the source viewer to be configured by this configuration
+	 * @param contentType
+	 *            the content type for which the strategy is applicable
+	 * @return a double-click strategy or <code>null</code> if double
+	 *         clicking should not be supported
+	 */
+	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
+		ITextDoubleClickStrategy strategy = null;
+		Object extendedStrategy = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.DOUBLECLICKSTRATEGY, contentType);
+		if (extendedStrategy instanceof ITextDoubleClickStrategy) {
+			strategy = (ITextDoubleClickStrategy) extendedStrategy;
+		}
+		else {
+			strategy = super.getDoubleClickStrategy(sourceViewer, contentType);
+		}
+		return strategy;
+	}
+
+	/**
 	 * Returns the hyperlink presenter for the given source viewer.<br />
 	 * Note: Clients cannot override this method because this method returns a
 	 * specially configured hyperlink presenter for the StructuredTextViewer.
@@ -380,8 +435,9 @@ public class StructuredTextViewerConfiguration extends TextSourceViewerConfigura
 	 *            applicable
 	 * @return IInformationProvider or null if should not be supported
 	 * @deprecated instead of overriding this method to provide documentation
-	 *             information, adopters should use the documentationTextHover
-	 *             element in the org.eclipse.wst.sse.ui.editorConfiguration
+	 *             information, adopters should use the
+	 *             <code>documentationTextHover</code> element in the
+	 *             <code>org.eclipse.wst.sse.ui.editorConfiguration</code>
 	 *             extension point
 	 */
 	protected IInformationProvider getInformationProvider(ISourceViewer sourceViewer, String partitionType) {
@@ -527,7 +583,8 @@ public class StructuredTextViewerConfiguration extends TextSourceViewerConfigura
 
 	/**
 	 * Create a documentation hover based on hovers contributed via
-	 * org.eclipse.wst.sse.ui.editorConfiguration extension point
+	 * <code>org.eclipse.wst.sse.ui.editorConfiguration</code> extension
+	 * point
 	 * 
 	 * @param partitionType
 	 * @return
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ExtendedConfigurationBuilder.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ExtendedConfigurationBuilder.java
index 460c874e41..7aaa739565 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ExtendedConfigurationBuilder.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ExtendedConfigurationBuilder.java
@@ -57,10 +57,15 @@ public class ExtendedConfigurationBuilder extends RegistryReader {
 	 */
 	public static final String SOURCEVIEWERCONFIGURATION = "sourceViewerConfiguration"; //$NON-NLS-1$
 	/**
-	 * Extension type to pass into getConfigurations to get documentation 
-	 * text hover
+	 * Extension type to pass into getConfigurations to get documentation text
+	 * hover
 	 */
 	public static final String DOCUMENTATIONTEXTHOVER = "documentationTextHover"; //$NON-NLS-1$
+	/**
+	 * Extension type to pass into getConfigurations to get double click
+	 * strategy
+	 */
+	public static final String DOUBLECLICKSTRATEGY = "doubleClickStrategy"; //$NON-NLS-1$
 
 	private static final String ATT_CLASS = "class"; //$NON-NLS-1$
 	private static final String ATT_TARGET = "target"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 534acedec6..ef3c201092 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -46,6 +46,14 @@
 		<propertySheetConfiguration
 			class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
 			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
+		<documentationTextHover
+        	class="org.eclipse.wst.xml.ui.internal.taginfo.XMLTagInfoHoverProcessor"
+        	target="org.eclipse.wst.xml.XML_DEFAULT">
+  		</documentationTextHover>
+  		<doubleClickStrategy
+        	class="org.eclipse.wst.xml.ui.internal.doubleclick.XMLDoubleClickStrategy"
+        	target="org.eclipse.wst.xml.XML_DEFAULT">
+  		</doubleClickStrategy>
 		<provisionalConfiguration
 			type="sourceeditingtexttools"
 			class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
@@ -62,6 +70,10 @@
 			type="org.eclipse.jface.text.quickassist.IQuickAssistProcessor"
 			class="org.eclipse.wst.xml.ui.internal.correction.XMLQuickAssistProcessor"
 			target="org.eclipse.wst.xml.XML_DEFAULT" />
+		<provisionalConfiguration
+			type="autoeditstrategy"
+			class="org.eclipse.wst.xml.ui.internal.autoedit.StructuredAutoEditStrategyXML"
+			target="org.eclipse.wst.xml.XML_DEFAULT" />
 		<provisionalDefinition
 			type="preferencepages"
 			value="org.eclipse.wst.sse.ui.preferences.xml, org.eclipse.wst.sse.ui.preferences.xml.source, org.eclipse.wst.sse.ui.preferences.xml.templates, org.eclipse.wst.sse.ui.preferences.xml.colors"
@@ -70,10 +82,6 @@
 			type="spellingregions"
 			value="XML_COMMENT_TEXT, XML_CONTENT, XML_DEFAULT"
 			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<documentationTextHover
-        	class="org.eclipse.wst.xml.ui.internal.taginfo.XMLTagInfoHoverProcessor"
-        	target="org.eclipse.wst.xml.XML_DEFAULT">
-  		</documentationTextHover>
 	</extension>
 
 	<extension
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java
index 6dc4715ffb..b1c195214b 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java
@@ -20,7 +20,6 @@ import java.util.Vector;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.formatter.IContentFormatter;
 import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
@@ -37,11 +36,9 @@ import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
 import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
 import org.eclipse.wst.xml.core.text.IXMLPartitions;
 import org.eclipse.wst.xml.ui.internal.autoedit.AutoEditStrategyForTabs;
-import org.eclipse.wst.xml.ui.internal.autoedit.StructuredAutoEditStrategyXML;
 import org.eclipse.wst.xml.ui.internal.contentassist.NoRegionContentAssistProcessor;
 import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
 import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.eclipse.wst.xml.ui.internal.doubleclick.XMLDoubleClickStrategy;
 import org.eclipse.wst.xml.ui.internal.style.LineStyleProviderForXML;
 import org.w3c.dom.Node;
 
@@ -83,10 +80,6 @@ public class StructuredTextViewerConfigurationXML extends StructuredTextViewerCo
 			allStrategies.add(superStrategies[i]);
 		}
 
-		if (contentType == IXMLPartitions.XML_DEFAULT) {
-			allStrategies.add(new StructuredAutoEditStrategyXML());
-		}
-
 		// be sure this is last, so it can modify any results form previous
 		// commands that might on on same partiion type.
 		// add auto edit strategy that handles when tab key is pressed
@@ -129,18 +122,6 @@ public class StructuredTextViewerConfigurationXML extends StructuredTextViewerCo
 		return formatter;
 	}
 
-	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
-
-		ITextDoubleClickStrategy doubleClickStrategy = null;
-		if (contentType.compareTo(IXMLPartitions.XML_DEFAULT) == 0) {
-			doubleClickStrategy = new XMLDoubleClickStrategy();
-		}
-		else {
-			doubleClickStrategy = super.getDoubleClickStrategy(sourceViewer, contentType);
-		}
-		return doubleClickStrategy;
-	}
-
 	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
 		Vector vector = new Vector();