feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: fakevim: fix undo after insert

Browse Source
This commit is contained in:
hjk
2009-03-12 17:25:43 +01:00
parent 4d55a30533
commit 782f42354b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -177,7 +177,7 @@ QDebug &operator<<(QDebug &ts, const EditOperation &op)
ts << "\n EDIT BLOCK WITH " << op.itemCount << " ITEMS"; ts << "\n EDIT BLOCK WITH " << op.itemCount << " ITEMS";
} else { } else {
ts << "\n EDIT AT " << op.position ts << "\n EDIT AT " << op.position
<< "\n FROM " << op.from << "\n TO " << op.to; << " FROM " << op.from << " TO " << op.to;
} }
return ts; return ts;
} }
@@ -1399,7 +1399,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
EventResult FakeVimHandler::Private::handleInsertMode(int key, int, EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
const QString &text) const QString &text)
{ {
if (key == Key_Escape) { if (key == Key_Escape || key == 27) {
// start with '1', as one instance was already physically inserted // start with '1', as one instance was already physically inserted
// while typing // while typing
QString data = m_lastInsertion; QString data = m_lastInsertion;
@@ -1412,6 +1412,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
//qDebug() << "UNDO: " << m_undoStack; //qDebug() << "UNDO: " << m_undoStack;
moveLeft(qMin(1, leftDist())); moveLeft(qMin(1, leftDist()));
m_dotCommand += m_lastInsertion; m_dotCommand += m_lastInsertion;
m_dotCommand += QChar(27);
enterCommandMode(); enterCommandMode();
} else if (key == Key_Left) { } else if (key == Key_Left) {
moveLeft(count()); moveLeft(count());
@@ -2275,13 +2276,14 @@ void FakeVimHandler::Private::recordPosition()
op.position = m_tc.position(); op.position = m_tc.position();
m_undoStack.push(op); m_undoStack.push(op);
m_redoStack.clear(); m_redoStack.clear();
//qDebug() << "MOVE: " << op; UNDO_DEBUG("MOVE: " << op);
//qDebug() << "\nSTACK: " << m_undoStack; UNDO_DEBUG("\nUNDO STACK: " << m_undoStack << "\n");
UNDO_DEBUG("\nREDO STACK: " << m_redoStack << "\n");
} }
void FakeVimHandler::Private::recordOperation(const EditOperation &op) void FakeVimHandler::Private::recordOperation(const EditOperation &op)
{ {
UNDO_DEBUG("OP: " << op); UNDO_DEBUG("RECORD OP: " << op);
// No need to record operations that actually do not change anything. // No need to record operations that actually do not change anything.
if (op.from.isEmpty() && op.to.isEmpty() && op.itemCount == 0) if (op.from.isEmpty() && op.to.isEmpty() && op.itemCount == 0)
return; return;
@@ -2290,7 +2292,8 @@ void FakeVimHandler::Private::recordOperation(const EditOperation &op)
return; return;
m_undoStack.push(op); m_undoStack.push(op);
m_redoStack.clear(); m_redoStack.clear();
UNDO_DEBUG("\nSTACK: " << m_undoStack); UNDO_DEBUG("\nUNDO STACK: " << m_undoStack << "\n");
UNDO_DEBUG("\nREDO STACK: " << m_redoStack << "\n");
} }
void FakeVimHandler::Private::recordInsert(int position, const QString &data) void FakeVimHandler::Private::recordInsert(int position, const QString &data)