Fixed bug 276345: block selection: getSelectionRanges() should be avoided if possible

1 files changed, 9 insertions, 6 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
index 7ba53363128..62e34c247fd 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
@@ -2521,9 +2521,9 @@ public class TextViewer extends Viewer implements
 	 */
 	public ISelection getSelection() {
 		if (fTextWidget != null && fTextWidget.getBlockSelection()) {
-			int[] ranges= fTextWidget.getSelectionRanges();
-			int startOffset= ranges[0];
-			int endOffset= ranges[ranges.length - 2] + ranges[ranges.length - 1];
+			Point sel = fTextWidget.getSelection();
+			int startOffset= sel.x;
+			int endOffset= sel.y;
 			
 			// getBlockSelectionBounds returns pixel coordinates relative to document
 			Rectangle bounds= fTextWidget.getBlockSelectionBounds();
@@ -3755,9 +3755,12 @@ public class TextViewer extends Viewer implements
 				return;
 		}
 		
-		if (fTextWidget.getBlockSelection() && fTextWidget.getSelectionRanges().length > 2 && (e.text == null || e.text.length() < 2)) {
-			verifyEventInBlockSelection(e);
-			return;
+		if (fTextWidget.getBlockSelection() && (e.text == null || e.text.length() < 2)) {
+			Point sel = fTextWidget.getSelection();
+			if (fTextWidget.getLineAtOffset(sel.x) != fTextWidget.getLineAtOffset(sel.y)) {
+				verifyEventInBlockSelection(e);
+				return;
+			}
 		}
 
 		IRegion modelRange= event2ModelRange(e);