Bug 547519 - [code mining] Fix apply on tabulationI20190627-1800

With patch for SWT bug 547519, it's not possible to draw annotations at
the right of a tabulation, just by fixing the char width.

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

2 files changed, 4 insertions, 5 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationDrawingStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationDrawingStrategy.java
index 038b1e215d5..ec8451dbafb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationDrawingStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationDrawingStrategy.java
@@ -248,8 +248,8 @@ class InlinedAnnotationDrawingStrategy implements IDrawingStrategy {
 			return;
 		}
 		if (gc != null) {
-			String hostCharacter= textWidget.getText(widgetOffset - 1, widgetOffset - 1);
-			int redrawnCharacterWidth= gc.stringExtent(hostCharacter).x;
+			char hostCharacter= textWidget.getText(widgetOffset - 1, widgetOffset - 1).charAt(0);
+			int redrawnCharacterWidth= hostCharacter != '\t' ? gc.getCharWidth(hostCharacter) : textWidget.getTabs() * gc.getCharWidth(' ');
 			Rectangle charBounds= textWidget.getTextBounds(widgetOffset - 1, widgetOffset - 1);
 			Rectangle annotationBounds= new Rectangle(charBounds.x + redrawnCharacterWidth, charBounds.y, annotation.getWidth(), charBounds.height);
 
@@ -299,7 +299,7 @@ class InlinedAnnotationDrawingStrategy implements IDrawingStrategy {
 					gc.setForeground(textWidget.getSelectionForeground());
 					gc.setBackground(textWidget.getSelectionBackground());
 				}
-				gc.drawString(hostCharacter, charBounds.x, charBounds.y, true);
+				gc.drawString(Character.toString(hostCharacter), charBounds.x, charBounds.y, true);
 				// END TO REMOVE
 			} else if (style != null && style.metrics != null && style.metrics.width != 0) {
 				// line content annotation had an , reset it
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/LineContentAnnotation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/LineContentAnnotation.java
index 6a606360b57..699a92d8545 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/LineContentAnnotation.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/LineContentAnnotation.java
@@ -152,8 +152,7 @@ public class LineContentAnnotation extends AbstractInlinedAnnotation {
 
 	boolean drawRightToPreviousChar(int widgetOffset) {
 		return widgetOffset > 0 &&
-				getTextWidget().getLineAtOffset(widgetOffset) == getTextWidget().getLineAtOffset(widgetOffset - 1) &&
-				getTextWidget().getText().charAt(widgetOffset - 1) != '\t'; // \t workaround bug 547532
+				getTextWidget().getLineAtOffset(widgetOffset) == getTextWidget().getLineAtOffset(widgetOffset - 1);
 	}
 
 }