Add support for easily configure colors of gherking editor

Author: Christoph Läubrich

io.cucumber.eclipse.editor/META-INF/MANIFEST.MF

@@ -47,7 +47,8 @@ Export-Package: io.cucumber.eclipse.editor,
  io.cucumber.eclipse.editor.hyperlinks,
  io.cucumber.eclipse.editor.launching,
  io.cucumber.eclipse.editor.marker,
- io.cucumber.eclipse.editor.steps
+ io.cucumber.eclipse.editor.steps,
+ io.cucumber.eclipse.editor.syntaxhighlight
 Import-Package: org.apache.commons.io;version="[2.16.0,3.0.0)",
  org.apache.commons.text.similarity;version="[1.14.0,2.0.0)",
  org.osgi.service.component.annotations;version="1.3.0"

io.cucumber.eclipse.editor/src/io/cucumber/eclipse/editor/syntaxhighlight/ColorManager.java

@@ -1,18 +1,36 @@
 package io.cucumber.eclipse.editor.syntaxhighlight;
 
+import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.PlatformUI;
 
 public enum GherkinColors {
-	COMMENT	("cucumber.eclipse.editor.presentation.gherkin_comment_colour"), 
-	KEYWORD	("cucumber.eclipse.editor.presentation.gherkin_keyword_colour"), 
-	PLACEHOLDER	("cucumber.eclipse.editor.presentation.gherkin_placeholder_colour"),
-	STRING	("cucumber.eclipse.editor.presentation.gherkin_string_colour"), 
-	NUMERIC	("cucumber.eclipse.editor.presentation.gherkin_numeric_literal_colour"), 
-	STEP	("cucumber.eclipse.editor.presentation.gherkin_step_colour"), 
-	TAG		("cucumber.eclipse.editor.presentation.gherkin_tag_colour"), 
-	DEFAULT	("cucumber.eclipse.editor.presentation.gherkin_text_colour");
-	
-	public final String COLOR_PREFERENCE_ID;
+	COMMENT("cucumber.eclipse.editor.presentation.gherkin_comment_colour"),
+	KEYWORD("cucumber.eclipse.editor.presentation.gherkin_keyword_colour"),
+	PLACEHOLDER("cucumber.eclipse.editor.presentation.gherkin_placeholder_colour"),
+	STRING("cucumber.eclipse.editor.presentation.gherkin_string_colour"),
+	NUMERIC("cucumber.eclipse.editor.presentation.gherkin_numeric_literal_colour"),
+	STEP("cucumber.eclipse.editor.presentation.gherkin_step_colour"),
+	TAG("cucumber.eclipse.editor.presentation.gherkin_tag_colour"),
+	DEFAULT("cucumber.eclipse.editor.presentation.gherkin_text_colour");
+
+	private final String id;
+
 	private GherkinColors(String id) {
-		COLOR_PREFERENCE_ID = id;
+		this.id = id;
 	}
+
+	public void setColor(RGB rgb) {
+		getColorRegistry().put(id, rgb);
+	}
+
+	public Color getColor() {
+		return getColorRegistry().get(id);
+	}
+
+	private ColorRegistry getColorRegistry() {
+		return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
+	}
+
 }

io.cucumber.eclipse.editor/src/io/cucumber/eclipse/editor/syntaxhighlight/GherkinColors.java

@@ -18,21 +18,18 @@
 
 public class GherkinKeywordScanner extends RuleBasedScanner {
 
-    private ColorManager manager;
-	
-	public GherkinKeywordScanner(ColorManager manager) {
-		this.manager = manager;
+	public GherkinKeywordScanner() {
 	}
 
 	public void configureRules(GherkinEditorDocument document) {
-		IToken keyword= new Token(new TextAttribute(manager.getColor(GherkinColors.KEYWORD)));
-		IToken step= new Token(new TextAttribute(manager.getColor(GherkinColors.STEP)));
-		IToken tag= new Token(new TextAttribute(manager.getColor(GherkinColors.TAG)));
-		IToken string= new Token(new TextAttribute(manager.getColor(GherkinColors.STRING)));
-		IToken comment= new Token(new TextAttribute(manager.getColor(GherkinColors.COMMENT)));
-		IToken other= new Token(new TextAttribute(manager.getColor(GherkinColors.DEFAULT)));
-		IToken numeric= new Token(new TextAttribute(manager.getColor(GherkinColors.NUMERIC)));
-		IToken placeholder= new Token(new TextAttribute(manager.getColor(GherkinColors.PLACEHOLDER)));
+		IToken keyword = new Token(new TextAttribute(GherkinColors.KEYWORD.getColor()));
+		IToken step = new Token(new TextAttribute(GherkinColors.STEP.getColor()));
+		IToken tag = new Token(new TextAttribute(GherkinColors.TAG.getColor()));
+		IToken string = new Token(new TextAttribute(GherkinColors.STRING.getColor()));
+		IToken comment = new Token(new TextAttribute(GherkinColors.COMMENT.getColor()));
+		IToken other = new Token(new TextAttribute(GherkinColors.DEFAULT.getColor()));
+		IToken numeric = new Token(new TextAttribute(GherkinColors.NUMERIC.getColor()));
+		IToken placeholder = new Token(new TextAttribute(GherkinColors.PLACEHOLDER.getColor()));
 
 
 		List<IRule> rules= new ArrayList<IRule>();

io.cucumber.eclipse.editor/src/io/cucumber/eclipse/editor/syntaxhighlight/GherkinKeywordScanner.java

@@ -14,7 +14,7 @@
 public class GherkinPresentationReconciler extends PresentationReconciler implements IPresentationReconciler {
 
 	public GherkinPresentationReconciler() {
-		DefaultDamagerRepairer dr = new GherkinDamagerRepairer(new GherkinKeywordScanner(new ColorManager()));
+		DefaultDamagerRepairer dr = new GherkinDamagerRepairer(new GherkinKeywordScanner());
 		this.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
 		this.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
 	}