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

Merge remote-tracking branch 'origin/3.3'

Browse Source
This commit is contained in:
Eike Ziller
2014-11-06 12:38:37 +01:00
parent ab1159096d 41db321a69
commit 3f1deee5e1
305 changed files with 2046 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1125,6 +1125,9 @@ public:
QString toString() const
{
if (!m_text.isEmpty())
return QString(m_text).replace(_("<"), _("<LT>"));
QString key = vimKeyNames().key(m_key);
bool namedKey = !key.isEmpty();
@@ -6894,11 +6897,12 @@ QString FakeVimHandler::Private::selectText(const Range &range) const
return tc.selection().toPlainText();
}
if (range.rangemode == RangeLineMode) {
const QTextBlock firstBlock = document()->findBlock(range.beginPos);
int firstPos = firstBlock.isValid() ? firstBlock.position() : 0;
QTextBlock lastBlock = document()->findBlock(range.endPos);
bool endOfDoc = lastBlock == document()->lastBlock();
int lastPos = endOfDoc ? lastPositionInDocument(true) : lastBlock.next().position();
QTextCursor tc(document());
int firstPos = firstPositionInLine(lineForPosition(range.beginPos));
int lastLine = lineForPosition(range.endPos);
bool endOfDoc = lastLine == lineNumber(document()->lastBlock());
int lastPos = endOfDoc ? lastPositionInDocument(true) : firstPositionInLine(lastLine + 1);
tc.setPosition(firstPos, MoveAnchor);
tc.setPosition(lastPos, KeepAnchor);
return tc.selection().toPlainText() + _(endOfDoc? "\n" : "");