diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index e3d026a1157764d81477ae7a2d0533b181babae5..ec0d9a4b517e435418d22569db8ba7044036a57c 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -35,8 +35,8 @@
// Instead emit signals and let the FakeVimPlugin channel the information to
// Qt Creator. The idea is to keep this file here in a "clean" state that
// allows easy reuse with any QTextEdit or QPlainTextEdit derived class.
-//
-//
+
+
// Some conventions:
//
// Use 1 based line numbers and 0 based column numbers. Even though
@@ -253,8 +253,9 @@ private:
bool isElectricCharacter(QChar c) const
{ return c == '{' || c == '}' || c == '#'; }
int indentDist() const;
- void indentRegion(QTextBlock first, QTextBlock last, QChar typedChar=0);
- void indentCurrentLine(QChar typedChar);
+ void indentRegion(QChar lastTyped = QChar());
+ void shiftRegionLeft(int repeat = 1);
+ void shiftRegionRight(int repeat = 1);
void moveToFirstNonBlankOnLine();
void moveToDesiredColumn();
@@ -327,9 +328,6 @@ public:
QString m_lastInsertion;
// undo handling
- void shiftRegionLeft(int repeat = 1);
- void shiftRegionRight(int repeat = 1);
-
void recordOperation(const EditOperation &op);
void recordInsert(int position, const QString &data);
void recordRemove(int position, const QString &data);
@@ -632,15 +630,7 @@ void FakeVimHandler::Private::finishMovement(const QString &dotCommand)
} else if (m_submode == ReplaceSubMode) {
m_submode = NoSubMode;
} else if (m_submode == IndentSubMode) {
- QTextDocument *doc = EDITOR(document());
- int start = m_tc.selectionStart();
- int end = m_tc.selectionEnd();
- if (start > end)
- qSwap(start, end);
- QTextBlock startBlock = doc->findBlock(start);
- indentRegion(doc->findBlock(start), doc->findBlock(end).next());
- setPosition(startBlock.position());
- moveToFirstNonBlankOnLine();
+ indentRegion();
m_submode = NoSubMode;
} else if (m_submode == ShiftRightSubMode) {
shiftRegionRight(1);
@@ -831,7 +821,10 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_dotCommand = QString("%1>>").arg(count());
finishMovement();
} else if (m_submode == IndentSubMode && key == '=') {
- indentRegion(m_tc.block(), m_tc.block().next());
+ setAnchor();
+ moveDown(count() - 1);
+ m_moveType = MoveLineWise;
+ m_dotCommand = QString("%1>>").arg(count());
finishMovement();
} else if (m_submode == ZSubMode) {
//qDebug() << "Z_MODE " << cursorLineInDocument() << linesOnScreen();
@@ -993,21 +986,20 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
enterCommandMode();
m_dotCommand = savedCommand;
} else if (key == '<' && m_visualMode == NoVisualMode) {
- m_savedYankPosition = m_tc.position();
m_submode = ShiftLeftSubMode;
} else if (key == '<' && m_visualMode != NoVisualMode) {
- m_savedYankPosition = m_tc.position();
shiftRegionLeft(1);
leaveVisualMode();
} else if (key == '>' && m_visualMode == NoVisualMode) {
- m_savedYankPosition = m_tc.position();
m_submode = ShiftRightSubMode;
} else if (key == '>' && m_visualMode != NoVisualMode) {
- m_savedYankPosition = m_tc.position();
shiftRegionRight(1);
leaveVisualMode();
- } else if (key == '=') {
+ } else if (key == '=' && m_visualMode == NoVisualMode) {
m_submode = IndentSubMode;
+ } else if (key == '=' && m_visualMode != NoVisualMode) {
+ indentRegion();
+ leaveVisualMode();
} else if (key == '%') {
m_moveType = MoveExclusive;
moveToMatchingParanthesis();
@@ -1419,7 +1411,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
m_tc.insertBlock();
m_lastInsertion += "\n";
if (0 && m_config[ConfigAutoIndent] == ConfigOn)
- indentRegion(m_tc.block(), m_tc.block().next(), '\n');
+ indentRegion('\n');
} else if (key == Key_Backspace || key == control('h')) {
m_tc.deletePreviousChar();
m_lastInsertion = m_lastInsertion.left(m_lastInsertion.size() - 1);
@@ -1451,18 +1443,8 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
&& isElectricCharacter(text.at(0))) {
const QString leftText = m_tc.block().text()
.left(m_tc.position() - 1 - m_tc.block().position());
- if (leftText.simplified().isEmpty()) {
- if (m_tc.hasSelection()) {
- QTextDocument *doc = EDITOR(document());
- QTextBlock block = doc->findBlock(qMin(m_tc.selectionStart(),
- m_tc.selectionEnd()));
- const QTextBlock end = doc->findBlock(qMax(m_tc.selectionStart(),
- m_tc.selectionEnd())).next();
- indentRegion(block, end, text.at(0));
- } else {
- indentCurrentLine(text.at(0));
- }
- }
+ if (leftText.simplified().isEmpty())
+ indentRegion(text.at(0));
}
} else {
return EventUnhandled;
@@ -1850,43 +1832,46 @@ void FakeVimHandler::Private::moveToFirstNonBlankOnLine()
int FakeVimHandler::Private::indentDist() const
{
int amount = 0;
- emit q->indentRegion(&amount, m_tc.block(), m_tc.block(), QChar(' '));
+ int line = cursorLineInDocument();
+ emit q->indentRegion(&amount, line, line, QChar(' '));
return amount;
}
-void FakeVimHandler::Private::indentRegion(QTextBlock begin, QTextBlock end, QChar typedChar)
+void FakeVimHandler::Private::indentRegion(QChar typedChar)
{
+ //int savedPos = anchor();
+ int beginLine = lineForPosition(anchor());
+ int endLine = lineForPosition(position());
+ if (beginLine > endLine)
+ qSwap(beginLine, endLine);
int amount = 0;
- emit q->indentRegion(&amount, begin, end, typedChar);
-}
-
-void FakeVimHandler::Private::indentCurrentLine(QChar typedChar)
-{
- indentRegion(m_tc.block(), m_tc.block().next(), typedChar);
+ emit q->indentRegion(&amount, beginLine, endLine, typedChar);
}
void FakeVimHandler::Private::shiftRegionRight(int repeat)
{
- int savedPos = anchor();
int beginLine = lineForPosition(anchor());
int endLine = lineForPosition(position());
if (beginLine > endLine)
qSwap(beginLine, endLine);
int len = m_config[ConfigShiftWidth].toInt() * repeat;
QString indent(len, ' ');
+
recordBeginGroup();
recordPosition();
+
for (int line = beginLine; line <= endLine; ++line) {
setPosition(firstPositionInLine(line));
recordInsertText(indent);
}
+
+ setPosition(firstPositionInLine(beginLine));
+ moveToFirstNonBlankOnLine();
recordEndGroup();
- setPosition(savedPos);
}
void FakeVimHandler::Private::shiftRegionLeft(int repeat)
{
- int savedPos = anchor();
int beginLine = lineForPosition(anchor());
int endLine = lineForPosition(position());
if (beginLine > endLine)
@@ -1916,8 +1901,10 @@ void FakeVimHandler::Private::shiftRegionLeft(int repeat)
text = recordRemoveSelectedText();
setPosition(pos);
}
+
+ setPosition(firstPositionInLine(beginLine));
+ moveToFirstNonBlankOnLine();
recordEndGroup();
- setPosition(savedPos);
}
void FakeVimHandler::Private::moveToDesiredColumn()
diff --git a/src/plugins/fakevim/fakevimhandler.h b/src/plugins/fakevim/fakevimhandler.h
index b0d647b035c60953f716b1a428d62aa82dc7295c..d7d978c9d8a90b5c7824f5ecaf79b222bb3d7660 100644
--- a/src/plugins/fakevim/fakevimhandler.h
+++ b/src/plugins/fakevim/fakevimhandler.h
@@ -32,7 +32,6 @@
#include <QtCore/QObject>
#include <QtGui/QTextEdit>
-#include <QtGui/QTextBlock>
QT_BEGIN_NAMESPACE
class QString;
@@ -77,7 +76,7 @@ signals:
void writeFileRequested(bool *handled,
const QString &fileName, const QString &contents);
void moveToMatchingParenthesis(bool *moved, bool *forward, QTextCursor *cursor);
- void indentRegion(int *amount, QTextBlock begin, QTextBlock end, QChar typedChar);
+ void indentRegion(int *amount, int beginLine, int endLine, QChar typedChar);
private:
bool eventFilter(QObject *ob, QEvent *ev);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 876e298e2891806fccd45269a019cd78ddb0ae4b..b2f462c1d93cfe56b244022dd3cae2d2f472d021 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -122,7 +122,7 @@ private slots:
void changeSelection(const QList<QTextEdit::ExtraSelection> &selections);
void writeFile(bool *handled, const QString &fileName, const QString &contents);
void moveToMatchingParenthesis(bool *moved, bool *forward, QTextCursor *cursor);
- void indentRegion(int *amount, QTextBlock begin, QTextBlock end, QChar typedChar);
+ void indentRegion(int *amount, int beginLine, int endLine, QChar typedChar);
private:
FakeVimPlugin *q;
@@ -206,8 +206,8 @@ void FakeVimPluginPrivate::installHandler(Core::IEditor *editor)
this, SLOT(changeSelection(QList<QTextEdit::ExtraSelection>)));
connect(handler, SIGNAL(moveToMatchingParenthesis(bool*,bool*,QTextCursor*)),
this, SLOT(moveToMatchingParenthesis(bool*,bool*,QTextCursor*)));
- connect(handler, SIGNAL(indentRegion(int*,QTextBlock,QTextBlock,QChar)),
- this, SLOT(indentRegion(int*,QTextBlock,QTextBlock,QChar)));
+ connect(handler, SIGNAL(indentRegion(int*,int,int,QChar)),
+ this, SLOT(indentRegion(int*,int,int,QChar)));
handler->setupWidget();
handler->setExtraData(editor);
@@ -291,7 +291,7 @@ void FakeVimPluginPrivate::moveToMatchingParenthesis(bool *moved, bool *forward,
}
}
-void FakeVimPluginPrivate::indentRegion(int *amount, QTextBlock begin, QTextBlock end,
+void FakeVimPluginPrivate::indentRegion(int *amount, int beginLine, int endLine,
QChar typedChar)
{
FakeVimHandler *handler = qobject_cast<FakeVimHandler *>(sender());
@@ -307,7 +307,9 @@ void FakeVimPluginPrivate::indentRegion(int *amount, QTextBlock begin, QTextBloc
indenter.setIndentSize(bt->tabSettings().m_indentSize);
indenter.setTabSize(bt->tabSettings().m_tabSize);
- const QTextDocument *doc = begin.document();
+ const QTextDocument *doc = bt->document();
+ QTextBlock begin = doc->findBlockByNumber(beginLine);
+ QTextBlock end = doc->findBlockByNumber(endLine);
const TextEditor::TextBlockIterator docStart(doc->begin());
QTextBlock cur = begin;
do {
diff --git a/src/shared/indenter/indenter.h b/src/shared/indenter/indenter.h
index 1012cb9a209f8743918de98002800cc0ead297ff..2c61dca3b9d67e62a08201b019fe26508d1b531c 100644
--- a/src/shared/indenter/indenter.h
+++ b/src/shared/indenter/indenter.h
@@ -35,6 +35,7 @@
namespace SharedTools {
namespace IndenterInternal {
+
/* String constants and regexps required by the indenter. Separate for code cleanliness*/
struct Constants {
Constants();
@@ -115,6 +116,7 @@ private:
bool isUnfinishedLine();
bool isContinuationLine();
int indentForContinuationLine();
+
int indentForStandaloneLine();
IndenterInternal::Constants m_constants;