Attachment 222508 Details for Bug 386472 – Patch v2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch v2

patch386472_201210180900.txt (text/plain), 5.71 KB, created by Szymon Ptaszkiewicz

on 2012-10-18 03:28:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2012-10-18 03:28:00 EDT

Size: 5.71 KB

patch

obsolete

>diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
>index a7733f5..94cfbb7 100644
>--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
>+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009, 2010 Avaloq Evolution AG and others.
>+ * Copyright (c) 2009, 2012 Avaloq Evolution AG and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -11,6 +11,8 @@
> package org.eclipse.jface.internal.text;
> 
> import java.util.Arrays;
>+
>+import org.eclipse.swt.graphics.GC;
> 
> import org.eclipse.core.runtime.Assert;
> 
>@@ -216,7 +218,7 @@
> 	};
> 
> 	private final Implementation COLUMN_IMPLEMENTATION= new Implementation() {
>-		TextEdit replace(ISelection selection, String replacement) throws BadLocationException {
>+		private TextEdit replace(ISelection selection, String replacement, boolean delete) throws BadLocationException {
> 			try {
> 				MultiTextEdit root;
> 				IBlockTextSelection cts= (IBlockTextSelection)selection;
>@@ -244,7 +246,7 @@
> 							lastDelim= index[0] + delimiters[index[1]].length();
> 						}
> 					}
>-					TextEdit replace= createReplaceEdit(line, visualStartColumn, visualEndColumn, string);
>+					TextEdit replace= createReplaceEdit(line, visualStartColumn, visualEndColumn, string, delete);
> 					root.addChild(replace);
> 				}
> 				while (lastDelim != -1) {
>@@ -261,7 +263,7 @@
> 					endLine++;
> 					TextEdit edit;
> 					if (endLine < fDocument.getNumberOfLines()) {
>-						edit= createReplaceEdit(endLine, visualStartColumn, visualEndColumn, string);
>+						edit= createReplaceEdit(endLine, visualStartColumn, visualEndColumn, string, delete);
> 					} else {
> 						// insertion reaches beyond the last line
> 						int insertLocation= root.getExclusiveEnd();
>@@ -279,6 +281,10 @@
> 				Assert.isTrue(false);
> 				return null;
> 			}
>+		}
>+
>+		TextEdit replace(ISelection selection, String replacement) throws BadLocationException {
>+			return replace(selection, replacement, false);
> 		}
> 
> 		String getText(ISelection selection) throws BadLocationException {
>@@ -321,7 +327,7 @@
> 				IBlockTextSelection cts= (IBlockTextSelection)selection;
> 				selection= new BlockTextSelection(fDocument, cts.getStartLine(), cts.getStartColumn(), cts.getEndLine(), cts.getEndColumn() + 1, fTabWidth);
> 			}
>-			return replace(selection, ""); //$NON-NLS-1$
>+			return replace(selection, "", true); //$NON-NLS-1$
> 		}
> 
> 		TextEdit backspace(ISelection selection) throws BadLocationException {
>@@ -392,7 +398,7 @@
> 			return ts.getEndLine() - ts.getStartLine() + 1;
> 		}
> 
>-		private TextEdit createReplaceEdit(int line, int visualStartColumn, int visualEndColumn, String replacement) throws BadLocationException {
>+		private TextEdit createReplaceEdit(int line, int visualStartColumn, int visualEndColumn, String replacement, boolean delete) throws BadLocationException {
> 			IRegion info= fDocument.getLineInformation(line);
> 			int lineLength= info.getLength();
> 			String content= fDocument.get(info.getOffset(), lineLength);
>@@ -400,11 +406,30 @@
> 			int endColumn= -1;
> 			int visual= 0;
> 			for (int offset= 0; offset < lineLength; offset++) {
>-				if (startColumn == -1 && visual >= visualStartColumn)
>-					startColumn= offset;
>-				if (visual >= visualEndColumn) {
>-					endColumn= offset;
>-					break;
>+				if (startColumn == -1) {
>+					if (visual == visualStartColumn)
>+						if (!delete && isWider(content.charAt(offset), visual) && replacement.length() == 0)
>+							startColumn= offset - 1;
>+						else
>+							startColumn= offset;
>+					else if (visual > visualStartColumn) {
>+						if (isWider(content.charAt(offset - 1), visual))
>+							startColumn= offset - 1;
>+						else
>+							startColumn= offset;
>+					}
>+				}
>+				if (startColumn != -1) {
>+					if (visual == visualEndColumn) {
>+						endColumn= offset;
>+						break;
>+					} else if (visual > visualEndColumn) {
>+						if (!delete && isWider(content.charAt(offset - 1), visual))
>+							endColumn= offset - 1;
>+						else
>+							endColumn= offset;
>+						break;
>+					}
> 				}
> 				visual+= visualSizeIncrement(content.charAt(offset), visual);
> 			}
>@@ -476,6 +501,10 @@
> 			return lineLength + Math.max(0, visualColumn - visual);
> 		}
> 
>+		private boolean isWider(char character, int visual) {
>+			return visualSizeIncrement(character, visual) > 1;
>+		}
>+
> 		/**
> 		 * Returns the increment in visual length represented by <code>character</code> given the
> 		 * current visual length. The visual length is <code>1</code> unless <code>character</code>
>@@ -487,6 +516,8 @@
> 		 *         <code>[0,fTabWidth]</code>
> 		 */
> 		private int visualSizeIncrement(char character, int visual) {
>+			if (fGC != null && character > 255)
>+				return (int)Math.ceil(fGC.stringExtent(new String(Character.toString(character))).x / fSingleCharWidth);
> 			if (character != '\t')
> 				return 1;
> 			if (fTabWidth <= 0)
>@@ -503,6 +534,11 @@
> 
> 	private ISelectionProvider fSelectionProvider;
> 
>+	private GC fGC;
>+
>+	float fSingleCharWidth;
>+
>+
> 	/**
> 	 * Creates a new processor on the given viewer.
> 	 * 
>@@ -510,6 +546,9 @@
> 	 */
> 	public SelectionProcessor(ITextViewer viewer) {
> 		this(viewer.getDocument(), viewer.getTextWidget().getTabs());
>+		fGC= new GC(viewer.getTextWidget());
>+		fSingleCharWidth= fGC.stringExtent(" ").x; //$NON-NLS-1$
>+
> 		if (viewer instanceof ITextViewerExtension) {
> 			ITextViewerExtension ext= (ITextViewerExtension)viewer;
> 			fRewriteTarget= ext.getRewriteTarget();

Flags:

daniel_megert: review-

Actions: View | Diff

Attachments on bug 386472: 219474 | 219475 | 219515 | 219589 | 219595 | 219602 | 222508 | 222518