Bug 520685 - [Generic Editor] Sort ext. by most specialized content-typeI20170809-2000

Factorize extensions and registry polling (can be continued).
This allows most registries to return first the extension that applies
to the most specialized content-types.

Change-Id: Icfd5d0c2e72cd579e9fe8c034420d88c628f39a6
Signed-off-by: Mickael Istria <mistria@redhat.com>

7 files changed, 108 insertions, 12 deletions

diff --git a/org.eclipse.ui.genericeditor.tests/plugin.xml b/org.eclipse.ui.genericeditor.tests/plugin.xml
index a6b4124536f..4d02c03dfc1 100644
--- a/org.eclipse.ui.genericeditor.tests/plugin.xml
+++ b/org.eclipse.ui.genericeditor.tests/plugin.xml
@@ -36,14 +36,22 @@
 					class="org.eclipse.ui.genericeditor.tests.contributions.TheReconciler"
 					contentType="org.eclipse.ui.genericeditor.tests.content-type">
 		</reconciler>
-   </extension>
- <extension
+  </extension>
+	<extension
 			 point="org.eclipse.ui.genericeditor.presentationReconcilers">
 		<presentationReconciler
-					class="org.eclipse.ui.genericeditor.tests.contributions.ThePresentationReconciler"
-					contentType="org.eclipse.ui.genericeditor.tests.content-type">
+			class="org.eclipse.ui.genericeditor.tests.contributions.ThePresentationReconcilerBlue"
+			contentType="org.eclipse.core.runtime.text">
+		</presentationReconciler>
+		<presentationReconciler
+			class="org.eclipse.ui.genericeditor.tests.contributions.ThePresentationReconcilerRed"
+			contentType="org.eclipse.ui.genericeditor.tests.specialized-content-type">
+		</presentationReconciler>
+		<presentationReconciler
+			class="org.eclipse.ui.genericeditor.tests.contributions.ThePresentationReconcilerGreen"
+			contentType="org.eclipse.ui.genericeditor.tests.content-type">
 		</presentationReconciler>
-   </extension>
+	</extension>
  <extension
        point="org.eclipse.ui.ide.markerResolution">
     <markerResolutionGenerator
@@ -60,6 +68,13 @@
           name="Generic Editor Test content-type"
           priority="normal">
     </content-type>
+    <content-type
+          base-type="org.eclipse.ui.genericeditor.tests.content-type"
+          file-names="foo.txt"
+          id="org.eclipse.ui.genericeditor.tests.specialized-content-type"
+          name="Specialized Generic Editor content-type"
+          priority="normal">
+    </content-type>
  </extension>
  <extension
        point="org.eclipse.ui.genericeditor.autoEditStrategies">
@@ -69,11 +84,11 @@
     </autoEditStrategy>
     <autoEditStrategy
           class="org.eclipse.ui.genericeditor.tests.contributions.TheAutoEditStrategySecond"
-          contentType="org.eclipse.core.runtime.text">
+          contentType="org.eclipse.ui.genericeditor.tests.content-type">
     </autoEditStrategy>
     <autoEditStrategy
           class="org.eclipse.ui.genericeditor.tests.contributions.TheAutoEditStrategyThird"
-          contentType="org.eclipse.core.runtime.text">
+          contentType="org.eclipse.ui.genericeditor.tests.specialized-content-type">
     </autoEditStrategy>
  </extension>
 
diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/AutoEditTest.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/AutoEditTest.java
index 8a30f57a70d..1aa3a3e5146 100644
--- a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/AutoEditTest.java
+++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/AutoEditTest.java
@@ -25,7 +25,8 @@ public class AutoEditTest extends AbstratGenericEditorTest {
 		IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput());
 		StyledText control= (StyledText) editor.getAdapter(Control.class);
 		control.setText("");
-		Assert.assertEquals("AutoAddedFirst! AutoAddedSecond! AutoAddedThird!", document.get());
+		// order of auto-edits from most specialized to least specialized
+		Assert.assertEquals("AutoAddedThird!AutoAddedSecond!AutoAddedFirst!", document.get());
 	}
 
 }
diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategySecond.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategySecond.java
index 37e2587d8ed..92c0ec64b10 100644
--- a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategySecond.java
+++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategySecond.java
@@ -18,7 +18,7 @@ public class TheAutoEditStrategySecond implements IAutoEditStrategy {
 
 	@Override
 	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		command.text = command.text + " AutoAddedSecond!";
+		command.text = command.text + "AutoAddedSecond!";
 	}
 
 }
diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategyThird.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategyThird.java
index c7882aaf446..5c4ef8c8d3e 100644
--- a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategyThird.java
+++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/TheAutoEditStrategyThird.java
@@ -18,7 +18,7 @@ public class TheAutoEditStrategyThird implements IAutoEditStrategy {
 
 	@Override
 	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		command.text = command.text + " AutoAddedThird!";
+		command.text = command.text + "AutoAddedThird!";
 	}
 
 }
diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerBlue.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerBlue.java
new file mode 100644
index 00000000000..44ce5c58b31
--- /dev/null
+++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerBlue.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat Inc. 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Sopot Cela (Red Hat Inc.)
+ *******************************************************************************/
+package org.eclipse.ui.genericeditor.tests.contributions;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class ThePresentationReconcilerBlue extends PresentationReconciler {
+
+	public ThePresentationReconcilerBlue() {
+		RuleBasedScanner scanner= new RuleBasedScanner();
+		IRule[] rules = new IRule[1];
+		rules[0]= new SingleLineRule("'", "'", new Token(new TextAttribute(new Color(Display.getCurrent(), new RGB(0, 0, 255))))); //$NON-NLS-1$ //$NON-NLS-2$
+		scanner.setRules(rules);
+		DefaultDamagerRepairer dr= new DefaultDamagerRepairer(scanner);
+		this.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		this.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+	}
+
+}
diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerGreen.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerGreen.java
new file mode 100644
index 00000000000..2c6d8c41b54
--- /dev/null
+++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerGreen.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2016-2017 Red Hat Inc. 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Sopot Cela (Red Hat Inc.)
+ *******************************************************************************/
+package org.eclipse.ui.genericeditor.tests.contributions;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+/**
+ * This presentation reconciler is associated to a more "basic" content-type so it
+ * shouldn't be used.
+ */
+public class ThePresentationReconcilerGreen extends PresentationReconciler {
+
+	public ThePresentationReconcilerGreen() {
+		RuleBasedScanner scanner= new RuleBasedScanner();
+		IRule[] rules = new IRule[1];
+		rules[0]= new SingleLineRule("'", "'", new Token(new TextAttribute(new Color(Display.getCurrent(), new RGB(0, 255, 0))))); //$NON-NLS-1$ //$NON-NLS-2$
+		scanner.setRules(rules);
+		DefaultDamagerRepairer dr= new DefaultDamagerRepairer(scanner);
+		this.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		this.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+	}
+
+}
diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconciler.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerRed.java
index c2ee68a7417..abfd5cb0e1a 100644
--- a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconciler.java
+++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/ThePresentationReconcilerRed.java
@@ -23,9 +23,9 @@ import org.eclipse.jface.text.rules.RuleBasedScanner;
 import org.eclipse.jface.text.rules.SingleLineRule;
 import org.eclipse.jface.text.rules.Token;
 
-public class ThePresentationReconciler extends PresentationReconciler {
+public class ThePresentationReconcilerRed extends PresentationReconciler {
 
-	public ThePresentationReconciler() {
+	public ThePresentationReconcilerRed() {
 		RuleBasedScanner scanner= new RuleBasedScanner();
 		IRule[] rules = new IRule[1];
 		rules[0]= new SingleLineRule("'", "'", new Token(new TextAttribute(new Color(Display.getCurrent(), new RGB(255, 0, 0))))); //$NON-NLS-1$ //$NON-NLS-2$