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

fakevim: positioning fixes for linewise shifting

Browse Source
This commit is contained in:
hjk
2010-04-29 13:30:12 +02:00
parent 0e12240613
commit 26965d203d
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3249,7 +3249,6 @@ void FakeVimHandler::Private::indentSelectedText(QChar typedChar)
indentText(range, typedChar);
setPosition(firstPositionInLine(beginLine));
moveToTargetColumn();
handleStartOfLine();
setTargetColumn();
setDotCommand("%1==", endLine - beginLine + 1);
@@ -3278,24 +3277,27 @@ bool FakeVimHandler::Private::isElectricCharacter(QChar c) const
void FakeVimHandler::Private::shiftRegionRight(int repeat)
{
setTargetColumn();
int beginLine = lineForPosition(anchor());
int endLine = lineForPosition(position());
if (beginLine > endLine)
int targetPos = anchor();
if (beginLine > endLine) {
qSwap(beginLine, endLine);
targetPos = position();
}
if (hasConfig(ConfigStartOfLine))
targetPos = firstPositionInLine(beginLine);
int len = config(ConfigShiftWidth).toInt() * repeat;
QString indent(len, ' ');
int firstPos = firstPositionInLine(beginLine);
beginEditBlock(firstPos);
beginEditBlock(targetPos);
for (int line = beginLine; line <= endLine; ++line) {
setPosition(firstPositionInLine(line));
m_tc.insertText(indent);
}
endEditBlock();
setPosition(firstPos);
moveToTargetColumn();
setPosition(targetPos);
handleStartOfLine();
setTargetColumn();
setDotCommand("%1>>", endLine - beginLine + 1);
@@ -3303,16 +3305,19 @@ void FakeVimHandler::Private::shiftRegionRight(int repeat)
void FakeVimHandler::Private::shiftRegionLeft(int repeat)
{
setTargetColumn();
int beginLine = lineForPosition(anchor());
int endLine = lineForPosition(position());
if (beginLine > endLine)
int targetPos = anchor();
if (beginLine > endLine) {
qSwap(beginLine, endLine);
targetPos = position();
}
const int shift = config(ConfigShiftWidth).toInt() * repeat;
const int tab = config(ConfigTabStop).toInt();
const int firstPos = firstPositionInLine(beginLine);
if (hasConfig(ConfigStartOfLine))
targetPos = firstPositionInLine(beginLine);
beginEditBlock(firstPos);
beginEditBlock(targetPos);
for (int line = endLine; line >= beginLine; --line) {
int pos = firstPositionInLine(line);
const QString text = lineContents(line);
@@ -3331,8 +3336,7 @@ void FakeVimHandler::Private::shiftRegionLeft(int repeat)
}
endEditBlock();
setPosition(firstPos);
moveToTargetColumn();
setPosition(targetPos);
handleStartOfLine();
setTargetColumn();
setDotCommand("%1<<", endLine - beginLine + 1);