From fe8713b811da0fc56345537b12d1ccce0a4de601 Mon Sep 17 00:00:00 2001
From: toshihiro <toshihiro>
Date: Mon, 18 Jun 2007 13:12:24 +0000
Subject: [PATCH] Addition of previous bugfix. Adjusting cursor positioning.

---
 .../phpeclipse/phpeditor/actions/RTrimAction.java  |   47 ++++++++++++++++----
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/actions/RTrimAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/actions/RTrimAction.java
index d0da3ca..a014e9e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/actions/RTrimAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/actions/RTrimAction.java
@@ -96,16 +96,45 @@ public class RTrimAction implements IEditorActionDelegate {
 					String newText = oldText.substring(0, lineEnd) + lineDelimiter;
 					doc.replace(offset, length, newText);
 
-					if (offset + length <= cursorOffset) {
-						if (oldText.length() != newText.length()) {
-							cursorOffset -= oldText.length() - newText.length();
+//					if (offset + length <= cursorOffset) {
+//						if (oldText.length() != newText.length()) {
+//							cursorOffset -= oldText.length() - newText.length();
+//						}
+//					} else if (offset <= cursorOffset + selectionLength
+//							&& selectionLength > 0) {
+//						selectionLength -= oldText.length() - newText.length();
+//					} else if (offset + length == cursorOffset + 2) {
+//						// Check if the cursor is at the end of the line.
+//						cursorOffset -= 2;
+//					}
+
+					int oldEndOffset = offset + length - lineDelimiter.length();
+					int newEndOffset = offset + lineEnd;
+
+					if (cursorOffset >= oldEndOffset) {
+						cursorOffset -= oldText.length() - newText.length();
+					} else if (cursorOffset >= newEndOffset) {
+						cursorOffset = newEndOffset;
+					}
+					if (selectionLength > 0) {
+						int selectionEndOffset = cursorOffset + selectionLength;
+						if (selectionEndOffset >= oldEndOffset) {
+							if (cursorOffset <= newEndOffset) {
+								// full overlap
+								selectionLength -= oldText.length() - newText.length();
+							} else {
+								// starts inside
+								selectionLength -= oldEndOffset - cursorOffset;
+							}
+						} else if (selectionEndOffset >= newEndOffset) {
+							if (cursorOffset <= newEndOffset) {
+								// ends inside
+								selectionLength -= selectionEndOffset - newEndOffset;
+							} else {
+								// full inside
+								selectionLength = 0;
+							}
 						}
-					} else if (offset <= cursorOffset + selectionLength
-							&& selectionLength > 0) {
-						selectionLength -= oldText.length() - newText.length();
-					} else if (offset + length == cursorOffset + 2) {
-						// Check if the cursor is at the end of the line.
-						cursorOffset -= 2;
 					}
 				}
 				currentLine++;
-- 
1.7.1