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

FakeVim: Update inserted text data only in focused editor

Browse Source 
If there are multiple instance of FakeVim handler for single buffer
(this happens when there are splits with the same document), buffer data
are modified only in the instance that handles the last focused editor.

Task-number: QTCREATORBUG-13481
Change-Id: Idfd2727917262bfffb410396a911519e85dfd463
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Lukas Holecek
2014-11-23 09:56:37 +01:00
committed by hjk
parent 115acfe127
commit 1203ef5b2f
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1950,6 +1950,8 @@ public:
void endEditBlock(); void endEditBlock();
void breakEditBlock() { m_buffer->breakEditBlock = true; } void breakEditBlock() { m_buffer->breakEditBlock = true; }
bool canModifyBufferData() const { return m_buffer->currentHandler == this; }
Q_SLOT void onContentsChanged(int position, int charsRemoved, int charsAdded); Q_SLOT void onContentsChanged(int position, int charsRemoved, int charsAdded);
Q_SLOT void onCursorPositionChanged(); Q_SLOT void onCursorPositionChanged();
Q_SLOT void onUndoCommandAdded(); Q_SLOT void onUndoCommandAdded();
@@ -2197,6 +2199,10 @@ public:
} insertState; } insertState;
QString lastInsertion; QString lastInsertion;
// If there are multiple editors with same document,
// only the handler with last focused editor can change buffer data.
QPointer<QObject> currentHandler;
}; };
typedef QSharedPointer<BufferData> BufferDataPtr; typedef QSharedPointer<BufferData> BufferDataPtr;
@@ -2348,6 +2354,8 @@ void FakeVimHandler::Private::init()
void FakeVimHandler::Private::focus() void FakeVimHandler::Private::focus()
{ {
m_buffer->currentHandler = this;
enterFakeVim(); enterFakeVim();
stopIncrementalFind(); stopIncrementalFind();
@@ -6506,6 +6514,9 @@ void FakeVimHandler::Private::pullOrCreateBufferData()
m_buffer = BufferDataPtr(new BufferData); m_buffer = BufferDataPtr(new BufferData);
document()->setProperty("FakeVimSharedData", QVariant::fromValue(m_buffer)); document()->setProperty("FakeVimSharedData", QVariant::fromValue(m_buffer));
} }
if (editor()->hasFocus())
m_buffer->currentHandler = this;
} }
// Helper to parse a-z,A-Z,48-57,_ // Helper to parse a-z,A-Z,48-57,_
@@ -7518,7 +7529,7 @@ void FakeVimHandler::Private::endEditBlock()
void FakeVimHandler::Private::onContentsChanged(int position, int charsRemoved, int charsAdded) void FakeVimHandler::Private::onContentsChanged(int position, int charsRemoved, int charsAdded)
{ {
// Record inserted and deleted text in insert mode. // Record inserted and deleted text in insert mode.
if (isInsertMode() && (charsAdded > 0 || charsRemoved > 0)) { if (isInsertMode() && (charsAdded > 0 || charsRemoved > 0) && canModifyBufferData()) {
BufferData::InsertState &insertState = m_buffer->insertState; BufferData::InsertState &insertState = m_buffer->insertState;
const int oldPosition = insertState.pos2; const int oldPosition = insertState.pos2;
if (!isInsertStateValid()) { if (!isInsertStateValid()) {
@@ -7577,6 +7588,9 @@ void FakeVimHandler::Private::onCursorPositionChanged()
void FakeVimHandler::Private::onUndoCommandAdded() void FakeVimHandler::Private::onUndoCommandAdded()
{ {
if (!canModifyBufferData())
return;
// Undo commands removed? // Undo commands removed?
UNDO_DEBUG("Undo added" << "previous: REV" << m_buffer->lastRevision); UNDO_DEBUG("Undo added" << "previous: REV" << m_buffer->lastRevision);
if (m_buffer->lastRevision >= revision()) { if (m_buffer->lastRevision >= revision()) {