From 4c2c654c2aa4eb330f147ec873c756878bcf2f46 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 28 May 2010 13:57:35 +0200
Subject: [PATCH] fakevim: fix (again) 'r' at last position of a line
---
src/plugins/fakevim/fakevimhandler.cpp | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index b9d2af0d69d..799e83f42aa 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -766,7 +766,8 @@ public:
void downCaseTransform(TransformationData *td);
void replaceText(const Range &range, const QString &str);
- void replaceTransform(TransformationData *td);
+ void replaceByStringTransform(TransformationData *td);
+ void replaceByCharTransform(TransformationData *td);
QString selectText(const Range &range) const;
void setCurrentRange(const Range &range);
@@ -1686,7 +1687,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
m_rangemode = RangeCharMode;
leaveVisualMode();
Range range = currentRange();
- Transformation tr = &FakeVimHandler::Private::replaceTransform;
+ Transformation tr =
+ &FakeVimHandler::Private::replaceByCharTransform;
transformText(range, tr, input.asChar());
setPosition(range.beginPos);
} else if (count() <= rightDist()) {
@@ -1694,6 +1696,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
moveRight(count());
replaceText(currentRange(), QString(count(), input.asChar()));
moveLeft();
+ setTargetColumn();
setDotCommand("%1r" + input.text(), count());
}
m_submode = NoSubMode;
@@ -4103,10 +4106,16 @@ void FakeVimHandler::Private::invertCaseTransform(TransformationData *td)
void FakeVimHandler::Private::replaceText(const Range &range, const QString &str)
{
- transformText(range, &FakeVimHandler::Private::replaceTransform, str);
+ Transformation tr = &FakeVimHandler::Private::replaceByStringTransform;
+ transformText(range, tr, str);
+}
+
+void FakeVimHandler::Private::replaceByStringTransform(TransformationData *td)
+{
+ td->to = td->extraData.toString();
}
-void FakeVimHandler::Private::replaceTransform(TransformationData *td)
+void FakeVimHandler::Private::replaceByCharTransform(TransformationData *td)
{
td->to = QString(td->from.size(), td->extraData.toChar());
}
--
GitLab