diff options
author | Mickael Istria | 2019-03-21 11:33:15 +0000 |
---|---|---|
committer | Mickael Istria | 2019-03-21 12:02:49 +0000 |
commit | f5879917fb106cf8bdc6a94a42805c6e4226a30b (patch) | |
tree | b5fdc8fc5efd9fc09efa6eb52ab305ca4f832446 | |
parent | 8c56c63ef93e93d8ed5d40f07ea107a4e7a02196 (diff) | |
download | eclipse.platform.text-I20190323-1800.tar.gz eclipse.platform.text-I20190323-1800.tar.xz eclipse.platform.text-I20190323-1800.zip |
Bug 533194 - [Code mining] Cannot position the caret on 1st letterI20190325-0105I20190324-1800I20190323-1800I20190322-1800
This change the drawing strategy to draw the code mining on the right of
the previous character, so caret always is just before the next char.
Change-Id: I3951a14faafebf3d947652e8dab2a8bdde27aa13
Signed-off-by: Mickael Istria <mistria@redhat.com>
5 files changed, 127 insertions, 39 deletions
diff --git a/org.eclipse.jface.text/META-INF/MANIFEST.MF b/org.eclipse.jface.text/META-INF/MANIFEST.MF index e58985b03d9..8d335ae4cee 100644 --- a/org.eclipse.jface.text/META-INF/MANIFEST.MF +++ b/org.eclipse.jface.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jface.text -Bundle-Version: 3.15.100.qualifier +Bundle-Version: 3.15.200.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: diff --git a/org.eclipse.jface.text/pom.xml b/org.eclipse.jface.text/pom.xml index 3a6170e5d32..f24407ffbb5 100644 --- a/org.eclipse.jface.text/pom.xml +++ b/org.eclipse.jface.text/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.jface</groupId> <artifactId>org.eclipse.jface.text</artifactId> - <version>3.15.100-SNAPSHOT</version> + <version>3.15.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> 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 a4907e9eb33..1bf56916bc6 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 @@ -21,7 +21,6 @@ import org.eclipse.swt.graphics.GlyphMetrics; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy; @@ -41,7 +40,7 @@ class InlinedAnnotationDrawingStrategy implements IDrawingStrategy { // The annotation is not in visible lines, don't draw it. return; } - InlinedAnnotationDrawingStrategy.draw((AbstractInlinedAnnotation) annotation, gc, textWidget, offset, length, + draw((AbstractInlinedAnnotation) annotation, gc, textWidget, offset, length, color); } @@ -132,6 +131,14 @@ class InlinedAnnotationDrawingStrategy implements IDrawingStrategy { */ private static void draw(LineContentAnnotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { + if (annotation.drawRightToPreviousChar(offset)) { + drawAsRightOfPreviousCharacter(annotation, gc, textWidget, offset, length, color); + } else { + drawAsLeftOf1stCharacter(annotation, gc, textWidget, offset, length, color); + } + } + + protected static void drawAsLeftOf1stCharacter(LineContentAnnotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { StyleRange style= null; try { style= textWidget.getStyleRangeAtOffset(offset); @@ -180,7 +187,7 @@ class InlinedAnnotationDrawingStrategy implements IDrawingStrategy { // END TO REMOVE // Annotation takes place, add GlyphMetrics width to the style - StyleRange newStyle= updateStyle(annotation, style); + StyleRange newStyle= annotation.updateStyle(style); if (newStyle != null) { textWidget.setStyleRange(newStyle); return; @@ -219,45 +226,75 @@ class InlinedAnnotationDrawingStrategy implements IDrawingStrategy { } } - /** - * Returns the style to apply with GlyphMetrics width only if needed. - * - * @param annotation the line content annotation - * @param style the current style and null otherwise. - * @return the style to apply with GlyphMetrics width only if needed. - */ - static StyleRange updateStyle(LineContentAnnotation annotation, StyleRange style) { - int width= annotation.getWidth(); - if (width == 0 || annotation.getRedrawnCharacterWidth() == 0) { - return null; + protected static void drawAsRightOfPreviousCharacter(LineContentAnnotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { + StyleRange style= null; + try { + style= textWidget.getStyleRangeAtOffset(offset - 1); + } catch (Exception e) { + return; } - int fullWidth= width + annotation.getRedrawnCharacterWidth(); - if (style == null) { - style= new StyleRange(); - Position position= annotation.getPosition(); - style.start= position.getOffset(); - style.length= 1; + if (isDeleted(annotation)) { + // When annotation is deleted, update metrics to null to remove extra spaces of the line content annotation. + if (style != null && style.metrics != null) { + style.metrics= null; + textWidget.setStyleRange(style); + } + return; } - GlyphMetrics metrics= style.metrics; - if (!annotation.isMarkedDeleted()) { - if (metrics == null) { - metrics= new GlyphMetrics(0, 0, fullWidth); - } else { - if (metrics.width == fullWidth) { - return null; + if (gc != null) { + String s= textWidget.getText(offset - 1, offset - 1); + int charWidth= gc.stringExtent(s).x; + Rectangle charBounds= textWidget.getTextBounds(offset - 1, offset - 1); + Rectangle annotationBounds= new Rectangle(charBounds.x + charWidth, charBounds.y, annotation.getWidth(), charBounds.height); + + // When line text has line header annotation, there is a space on the top, adjust the y by using char height + annotationBounds.y+= charBounds.height - textWidget.getLineHeight(); + + // Draw the line content annotation + annotation.setLocation(annotationBounds.x, annotationBounds.y); + annotation.draw(gc, textWidget, offset, length, color, annotationBounds.x, annotationBounds.y); + int width= annotation.getWidth(); + if (width != 0) { + // FIXME: remove this code when we need not redraw the character (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=531769) + // START TO REMOVE + annotation.setRedrawnCharacterWidth(charWidth); + // END TO REMOVE + + // Annotation takes place, add GlyphMetrics width to the style + StyleRange newStyle= annotation.updateStyle(style); + if (newStyle != null) { + textWidget.setStyleRange(newStyle); + return; } - /** - * We must create a new GlyphMetrics instance because comparison with similarTo used - * later in StyledText#setStyleRange will compare the same (modified) and won't - * realize an update happened. - */ - metrics= new GlyphMetrics(0, 0, fullWidth); + + // FIXME: remove this code when we need not redraw the character (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=531769) + // START TO REMOVE + // The inline annotation replaces one character by taking a place width + // GlyphMetrics + // Here we need to redraw this first character because GlyphMetrics clip this + // character. + if (style != null) { + if (style.background != null) { + gc.setBackground(style.background); + gc.fillRectangle(charBounds.x, charBounds.y, charWidth, charBounds.height); + } + if (style.foreground != null) { + gc.setForeground(style.foreground); + } else { + gc.setForeground(textWidget.getForeground()); + } + gc.setFont(annotation.getFont(style.fontStyle)); + } + gc.drawString(s, 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 + style.metrics= null; + textWidget.setStyleRange(style); } } else { - metrics= null; + textWidget.redrawRange(offset, length, true); } - style.metrics= metrics; - return style; } /** diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java index 1c473fa7ffb..0f0000cde76 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java @@ -107,7 +107,7 @@ public class InlinedAnnotationSupport { .forEachRemaining(annotation -> { if (annotation instanceof LineContentAnnotation) { LineContentAnnotation ann= (LineContentAnnotation) annotation; - StyleRange style= InlinedAnnotationDrawingStrategy.updateStyle(ann, null); + StyleRange style= ann.updateStyle(null); if (style != null) { textPresentation.mergeStyleRange(style); } 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 de61368058e..76c97148b57 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 @@ -13,9 +13,11 @@ */
package org.eclipse.jface.text.source.inlined;
+import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.GlyphMetrics;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.source.ISourceViewer;
@@ -97,4 +99,53 @@ public class LineContentAnnotation extends AbstractInlinedAnnotation { return (x >= this.fX && x <= this.fX + width && y >= this.fY && y <= this.fY + getTextWidget().getLineHeight());
}
+ /**
+ * Returns the style to apply with GlyphMetrics width only if needed.
+ *
+ * @param annotation the line content annotation
+ * @param usePreviousChar whether to attach the metrics to the offset char or previous one
+ * @param style the current style and null otherwise.
+ * @return the style to apply with GlyphMetrics width only if needed.
+ */
+ StyleRange updateStyle(StyleRange style) {
+ boolean usePreviousChar= drawRightToPreviousChar(getPosition().getOffset());
+ if (width == 0 || getRedrawnCharacterWidth() == 0) {
+ return null;
+ }
+ int fullWidth= width + getRedrawnCharacterWidth();
+ if (style == null) {
+ style= new StyleRange();
+ Position position= getPosition();
+ style.start= position.getOffset();
+ if (usePreviousChar) {
+ style.start--;
+ }
+ style.length= 1;
+ }
+ GlyphMetrics metrics= style.metrics;
+ if (!isMarkedDeleted()) {
+ if (metrics == null) {
+ metrics= new GlyphMetrics(0, 0, fullWidth);
+ } else {
+ if (metrics.width == fullWidth) {
+ return null;
+ }
+ /**
+ * We must create a new GlyphMetrics instance because comparison with similarTo used
+ * later in StyledText#setStyleRange will compare the same (modified) and won't
+ * realize an update happened.
+ */
+ metrics= new GlyphMetrics(0, 0, fullWidth);
+ }
+ } else {
+ metrics= null;
+ }
+ style.metrics= metrics;
+ return style;
+ }
+
+ boolean drawRightToPreviousChar(int offset) {
+ return getTextWidget().getLineAtOffset(offset) == getTextWidget().getLineAtOffset(offset - 1);
+ }
+
}
|