react on toolbar action or general switch-on/off

Author: marcushoepfner

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/ZeroWidthCharactersLineContentCodeMining.java

@@ -13,6 +13,13 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.texteditor.codemining;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Display;
+
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.codemining.ICodeMiningProvider;
 import org.eclipse.jface.text.codemining.LineContentCodeMining;
@@ -26,9 +33,11 @@
 class ZeroWidthCharactersLineContentCodeMining extends LineContentCodeMining {
 
 	private static final String ZW_CHARACTERS_MINING = "ZWSP"; //$NON-NLS-1$
+	private Color fgColor;
 
 	public ZeroWidthCharactersLineContentCodeMining(int offset, ICodeMiningProvider provider) {
 		super(new Position(offset, 1), true, provider);
+		fgColor = Display.getCurrent().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
 	}
 
 	@Override
@@ -40,4 +49,12 @@ public boolean isResolved() {
 	public String getLabel() {
 		return ZW_CHARACTERS_MINING;
 	}
+
+	@Override
+	public Point draw(GC gc, StyledText textWidget, Color color, int x, int y) {
+		gc.setForeground(fgColor);
+		Point point = super.draw(gc, textWidget, fgColor, x, y);
+		gc.setForeground(color);
+		return point;
+	}
 }

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/ZeroWidthCharactersLineContentCodeMiningProvider.java

@@ -13,6 +13,9 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.texteditor.codemining;
 
+import static org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_SHOW_WHITESPACE_CHARACTERS;
+import static org.eclipse.ui.texteditor.AbstractTextEditor.PREFERENCE_SHOW_ZW_CHARACTERS;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -30,8 +33,6 @@
 import org.eclipse.jface.text.codemining.ICodeMining;
 import org.eclipse.jface.text.source.ISourceViewerExtension5;
 
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
 /**
  * A code mining provider that draws zero-width characters (like zero-width
  * spaces) as line content code minings.
@@ -76,7 +77,8 @@ public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextVi
 
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
-		if (event.getProperty().equals(AbstractTextEditor.PREFERENCE_SHOW_ZW_CHARACTERS)) {
+		if (PREFERENCE_SHOW_ZW_CHARACTERS.equals(event.getProperty())
+				|| PREFERENCE_SHOW_WHITESPACE_CHARACTERS.equals(event.getProperty())) {
 			readShowZwspFromStore();
 			updateCodeMinings();
 		}
@@ -89,6 +91,7 @@ private void updateCodeMinings() {
 		}
 	}
 
+
 	@Override
 	public void dispose() {
 		store.removePropertyChangeListener(this);
@@ -106,6 +109,7 @@ private ICodeMining createCodeMining(int offset) {
 	}
 
 	private void readShowZwspFromStore() {
-		showZwsp = store.getBoolean(AbstractTextEditor.PREFERENCE_SHOW_ZW_CHARACTERS);
+		showZwsp = store.getBoolean(PREFERENCE_SHOW_ZW_CHARACTERS)
+				&& store.getBoolean(PREFERENCE_SHOW_WHITESPACE_CHARACTERS);
 	}
 }