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

Editor: Blockselection rewrite.

Browse Source 
Also adding the possibility to insert text into the blockselection.

Task-number: QTCREATORBUG-7773
Change-Id: I7a47a1d630f769a8253ee1a2f21057820ea170d5
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
David Schulz
2014-06-16 14:20:36 +02:00
committed by hjk
parent ce324b8d28
commit 6e9b724006
11 changed files with 1066 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1800,12 +1800,19 @@ public:
} }
// Set cursor in text editor widget. // Set cursor in text editor widget.
void commitCursor() { void commitCursor() {
if (editor()) if (isVisualBlockMode()) {
EDITOR(setTextCursor(m_cursor)); emit q->requestSetBlockSelection(m_cursor);
} else {
emit q->requestDisableBlockSelection();
if (editor())
EDITOR(setTextCursor(m_cursor));
}
} }
// Restore cursor from editor widget. // Restore cursor from editor widget.
void pullCursor() { void pullCursor() {
if (editor()) if (isVisualBlockMode())
q->requestBlockSelection(&m_cursor);
else if (editor())
m_cursor = EDITOR(textCursor()); m_cursor = EDITOR(textCursor());
} }
@@ -2500,14 +2507,12 @@ void FakeVimHandler::Private::exportSelection()
const int col2 = pos - document()->findBlock(pos).position(); const int col2 = pos - document()->findBlock(pos).position();
if (col1 > col2) if (col1 > col2)
++anc; ++anc;
else if (!atEndOfLine()) else if (!atBlockEnd())
++pos; ++pos;
// FIXME: After '$' command (i.e. m_visualTargetColumn == -1), end of selected lines // FIXME: After '$' command (i.e. m_visualTargetColumn == -1), end of selected lines
// should be selected. // should be selected.
setAnchorAndPosition(anc, pos); setAnchorAndPosition(anc, pos);
commitCursor(); commitCursor();
emit q->requestSetBlockSelection(false);
emit q->requestSetBlockSelection(true);
} else if (g.visualMode == VisualLineMode) { } else if (g.visualMode == VisualLineMode) {
const int posLine = lineForPosition(pos); const int posLine = lineForPosition(pos);
const int ancLine = lineForPosition(anc); const int ancLine = lineForPosition(anc);
@@ -2642,9 +2647,6 @@ void FakeVimHandler::Private::ensureCursorVisible()
void FakeVimHandler::Private::importSelection() void FakeVimHandler::Private::importSelection()
{ {
bool hasBlock = false;
emit q->requestHasBlockSelection(&hasBlock);
if (position() == m_oldExternalPosition if (position() == m_oldExternalPosition
&& anchor() == m_oldExternalAnchor) { && anchor() == m_oldExternalAnchor) {
// Undo drawing correction. // Undo drawing correction.
@@ -6867,8 +6869,6 @@ void FakeVimHandler::Private::scrollToLine(int line)
EDITOR(ensureCursorVisible()); EDITOR(ensureCursorVisible());
EDITOR(setTextCursor(tc)); EDITOR(setTextCursor(tc));
if (isVisualBlockMode())
emit q->requestSetBlockSelection(true);
m_firstVisibleLine = line; m_firstVisibleLine = line;
} }
@@ -7388,15 +7388,11 @@ bool FakeVimHandler::Private::passEventToEditor(QEvent &event)
{ {
removeEventFilter(); removeEventFilter();
commitCursor();
EDITOR(setOverwriteMode(false)); EDITOR(setOverwriteMode(false));
emit q->requestSetBlockSelection(false); commitCursor();
bool accepted = QApplication::sendEvent(editor(), &event); bool accepted = QApplication::sendEvent(editor(), &event);
if (!m_textedit && !m_plaintextedit) if (!m_textedit && !m_plaintextedit)
return false; return false;
if (isVisualBlockMode())
emit q->requestSetBlockSelection(true);
updateCursorShape(); updateCursorShape();
if (accepted) if (accepted)
@@ -7567,7 +7563,6 @@ void FakeVimHandler::Private::toggleVisualMode(VisualMode visualMode)
if (visualMode == g.visualMode) { if (visualMode == g.visualMode) {
leaveVisualMode(); leaveVisualMode();
} else { } else {
emit q->requestSetBlockSelection(false);
m_positionPastEnd = false; m_positionPastEnd = false;
m_anchorPastEnd = false; m_anchorPastEnd = false;
g.visualMode = visualMode; g.visualMode = visualMode;

4
src/plugins/fakevim/fakevimhandler.h
View File

@@ -148,7 +148,9 @@ signals:
void findRequested(bool reverse); void findRequested(bool reverse);
void findNextRequested(bool reverse); void findNextRequested(bool reverse);
void handleExCommandRequested(bool *handled, const ExCommand &cmd); void handleExCommandRequested(bool *handled, const ExCommand &cmd);
void requestSetBlockSelection(bool on); void requestDisableBlockSelection();
void requestSetBlockSelection(const QTextCursor&);
void requestBlockSelection(QTextCursor*);
void requestHasBlockSelection(bool *on); void requestHasBlockSelection(bool *on);
void foldToggle(int depth); void foldToggle(int depth);
void foldAll(bool fold); void foldAll(bool fold);

35
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -1018,7 +1018,9 @@ private slots:
void jumpToGlobalMark(QChar mark, bool backTickMode, const QString &fileName); void jumpToGlobalMark(QChar mark, bool backTickMode, const QString &fileName);
void showSettingsDialog(); void showSettingsDialog();
void maybeReadVimRc(); void maybeReadVimRc();
void setBlockSelection(bool); void disableBlockSelection();
void setBlockSelection(const QTextCursor&);
void blockSelection(QTextCursor *);
void hasBlockSelection(bool*); void hasBlockSelection(bool*);
void setShowRelativeLineNumbers(const QVariant &value); void setShowRelativeLineNumbers(const QVariant &value);
@@ -1767,8 +1769,12 @@ void FakeVimPluginPrivate::editorOpened(IEditor *editor)
SLOT(indentRegion(int,int,QChar))); SLOT(indentRegion(int,int,QChar)));
connect(handler, SIGNAL(checkForElectricCharacter(bool*,QChar)), connect(handler, SIGNAL(checkForElectricCharacter(bool*,QChar)),
SLOT(checkForElectricCharacter(bool*,QChar)), Qt::DirectConnection); SLOT(checkForElectricCharacter(bool*,QChar)), Qt::DirectConnection);
connect(handler, SIGNAL(requestSetBlockSelection(bool)), connect(handler, SIGNAL(requestDisableBlockSelection()),
SLOT(setBlockSelection(bool))); SLOT(disableBlockSelection()));
connect(handler, SIGNAL(requestSetBlockSelection(QTextCursor)),
SLOT(setBlockSelection(QTextCursor)));
connect(handler, SIGNAL(requestBlockSelection(QTextCursor*)),
SLOT(blockSelection(QTextCursor*)), Qt::DirectConnection);
connect(handler, SIGNAL(requestHasBlockSelection(bool*)), connect(handler, SIGNAL(requestHasBlockSelection(bool*)),
SLOT(hasBlockSelection(bool*)), Qt::DirectConnection); SLOT(hasBlockSelection(bool*)), Qt::DirectConnection);
connect(handler, SIGNAL(completionRequested()), connect(handler, SIGNAL(completionRequested()),
@@ -1864,13 +1870,32 @@ void FakeVimPluginPrivate::triggerSimpleCompletions(const QString &needle, bool
m_wordProvider->setActive(needle, forward, qobject_cast<FakeVimHandler *>(sender())); m_wordProvider->setActive(needle, forward, qobject_cast<FakeVimHandler *>(sender()));
} }
void FakeVimPluginPrivate::setBlockSelection(bool on) void FakeVimPluginPrivate::disableBlockSelection()
{ {
FakeVimHandler *handler = qobject_cast<FakeVimHandler *>(sender()); FakeVimHandler *handler = qobject_cast<FakeVimHandler *>(sender());
if (!handler) if (!handler)
return; return;
if (BaseTextEditorWidget *bt = qobject_cast<BaseTextEditorWidget *>(handler->widget())) if (BaseTextEditorWidget *bt = qobject_cast<BaseTextEditorWidget *>(handler->widget()))
bt->setBlockSelection(on); bt->setBlockSelection(false);
}
void FakeVimPluginPrivate::setBlockSelection(const QTextCursor &cursor)
{
FakeVimHandler *handler = qobject_cast<FakeVimHandler *>(sender());
if (!handler)
return;
if (BaseTextEditorWidget *bt = qobject_cast<BaseTextEditorWidget *>(handler->widget()))
bt->setBlockSelection(cursor);
}
void FakeVimPluginPrivate::blockSelection(QTextCursor *cursor)
{
FakeVimHandler *handler = qobject_cast<FakeVimHandler *>(sender());
if (!handler)
return;
if (BaseTextEditorWidget *bt = qobject_cast<BaseTextEditorWidget *>(handler->widget()))
if (cursor)
*cursor = bt->blockSelection();
} }
void FakeVimPluginPrivate::hasBlockSelection(bool *on) void FakeVimPluginPrivate::hasBlockSelection(bool *on)

843
src/plugins/texteditor/basetexteditor.cpp
View File

File diff suppressed because it is too large Load Diff

13
src/plugins/texteditor/basetexteditor.h
View File

@@ -206,11 +206,16 @@ public:
void setReadOnly(bool b); void setReadOnly(bool b);
void setTextCursor(const QTextCursor &cursor, bool keepBlockSelection);
void setTextCursor(const QTextCursor &cursor); void setTextCursor(const QTextCursor &cursor);
void insertCodeSnippet(const QTextCursor &cursor, const QString &snippet); void insertCodeSnippet(const QTextCursor &cursor, const QString &snippet);
void setBlockSelection(bool on); void setBlockSelection(bool on);
void setBlockSelection(int positionBlock, int positionColumn, int anchhorBlock,
int anchorColumn);
void setBlockSelection(const QTextCursor &cursor);
QTextCursor blockSelection() const;
bool hasBlockSelection() const; bool hasBlockSelection() const;
int verticalBlockSelectionFirstColumn() const; int verticalBlockSelectionFirstColumn() const;
@@ -231,6 +236,9 @@ public:
static QString msgTextTooLarge(quint64 size); static QString msgTextTooLarge(quint64 size);
void insertPlainText(const QString &text);
QString selectedText() const;
public slots: public slots:
virtual void copy(); virtual void copy();
virtual void paste(); virtual void paste();
@@ -310,6 +318,9 @@ public slots:
void indent(); void indent();
void unindent(); void unindent();
void undo();
void redo();
void openLinkUnderCursor(); void openLinkUnderCursor();
void openLinkUnderCursorInNextSplit(); void openLinkUnderCursorInNextSplit();
@@ -322,6 +333,7 @@ signals:
protected: protected:
bool event(QEvent *e); bool event(QEvent *e);
void inputMethodEvent(QInputMethodEvent *e);
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e);
void wheelEvent(QWheelEvent *e); void wheelEvent(QWheelEvent *e);
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
@@ -549,7 +561,6 @@ private:
void transformBlockSelection(Internal::TransformationMethod method); void transformBlockSelection(Internal::TransformationMethod method);
private slots: private slots:
void handleBlockSelection(int diff_row, int diff_col);
void updateTabStops(); void updateTabStops();
void applyFontSettingsDelayed(); void applyFontSettingsDelayed();

54
src/plugins/texteditor/basetexteditor_p.h
View File

@@ -59,23 +59,34 @@ class ClipboardAssistProvider;
class TEXTEDITOR_EXPORT BaseTextBlockSelection class TEXTEDITOR_EXPORT BaseTextBlockSelection
{ {
public: public:
BaseTextBlockSelection()
: positionBlock(0), positionColumn(0)
, anchorBlock(0) , anchorColumn(0){}
BaseTextBlockSelection(const BaseTextBlockSelection &other);
bool isValid() const{ return !firstBlock.isNull() && !lastBlock.isNull(); } void clear();
void clear() { firstBlock = lastBlock = QTextCursor(); } QTextCursor selection(const BaseTextDocument *baseTextDocument) const;
QTextCursor cursor(const BaseTextDocument *baseTextDocument) const;
void fromPostition(int positionBlock, int positionColumn, int anchorBlock, int anchorColumn);
bool hasSelection() { return !(positionBlock == anchorBlock && positionColumn == anchorColumn); }
QTextCursor firstBlock; // defines the first block // defines the first block
QTextCursor lastBlock; // defines the last block inline int firstBlockNumber() const { return qMin(positionBlock, anchorBlock); }
int firstVisualColumn; // defines the first visual column of the selection // defines the last block
int lastVisualColumn; // defines the last visual column of the selection inline int lastBlockNumber() const { return qMax(positionBlock, anchorBlock); }
enum Anchor {TopLeft = 0, TopRight, BottomLeft, BottomRight} anchor; // defines the first visual column of the selection
BaseTextBlockSelection():firstVisualColumn(0), lastVisualColumn(0), anchor(BottomRight){} inline int firstVisualColumn() const { return qMin(positionColumn, anchorColumn); }
void moveAnchor(int blockNumber, int visualColumn); // defines the last visual column of the selection
int position(const TabSettings &ts) const; inline int lastVisualColumn() const { return qMax(positionColumn, anchorColumn); }
inline int anchorColumnNumber() const { return (anchor % 2) ? lastVisualColumn : firstVisualColumn; }
inline int anchorBlockNumber() const { public:
return (anchor <= TopRight ? firstBlock.blockNumber() : lastBlock.blockNumber()); } int positionBlock;
QTextCursor selection(const TabSettings &ts) const; int positionColumn;
void fromSelection(const TabSettings &ts, const QTextCursor &selection); int anchorBlock;
int anchorColumn;
private:
QTextCursor cursor(const BaseTextDocument *baseTextDocument, bool fullSelection) const;
}; };
//================BaseTextEditorPrivate============== //================BaseTextEditorPrivate==============
@@ -180,9 +191,18 @@ public:
// block selection mode // block selection mode
bool m_inBlockSelectionMode; bool m_inBlockSelectionMode;
void clearBlockSelection();
QString copyBlockSelection(); QString copyBlockSelection();
void removeBlockSelection(const QString &text = QString()); void insertIntoBlockSelection(const QString &text = QString());
void setCursorToColumn(QTextCursor &cursor, int column,
QTextCursor::MoveMode moveMode = QTextCursor::MoveAnchor);
void removeBlockSelection();
void enableBlockSelection(const QTextCursor &cursor);
void enableBlockSelection(int positionBlock, int positionColumn,
int anchorBlock, int anchorColumn);
void disableBlockSelection(bool keepSelection = true);
void resetCursorFlashTimer();
QBasicTimer m_cursorFlashTimer;
bool m_cursorVisible;
bool m_moveLineUndoHack; bool m_moveLineUndoHack;
QTextCursor m_findScopeStart; QTextCursor m_findScopeStart;

462
src/plugins/texteditor/basetexteditor_test.cpp
View File

@@ -29,6 +29,7 @@
#ifdef WITH_TESTS #ifdef WITH_TESTS
#include <QClipboard>
#include <QString> #include <QString>
#include <QtTest/QtTest> #include <QtTest/QtTest>
@@ -42,80 +43,99 @@ using namespace TextEditor;
enum TransFormationType { Uppercase, Lowercase }; enum TransFormationType { Uppercase, Lowercase };
struct TestBlockSelection
{
int positionBlock;
int positionColumn;
int anchorBlock;
int anchorColumn;
TestBlockSelection(int positionBlock, int positionColumn, int anchorBlock, int anchorColumn)
: positionBlock(positionBlock), positionColumn(positionColumn)
, anchorBlock(anchorBlock), anchorColumn(anchorColumn) {}
TestBlockSelection() {}
};
Q_DECLARE_METATYPE(TransFormationType) Q_DECLARE_METATYPE(TransFormationType)
Q_DECLARE_METATYPE(TestBlockSelection)
void Internal::TextEditorPlugin::testBlockSelectionTransformation_data() void Internal::TextEditorPlugin::testBlockSelectionTransformation_data()
{ {
QTest::addColumn<QByteArray>("input"); QTest::addColumn<QString>("input");
QTest::addColumn<QByteArray>("transformedText"); QTest::addColumn<QString>("transformedText");
QTest::addColumn<int>("position"); QTest::addColumn<TestBlockSelection>("selection");
QTest::addColumn<int>("anchor");
QTest::addColumn<TransFormationType>("type"); QTest::addColumn<TransFormationType>("type");
QTest::newRow("uppercase") QTest::newRow("uppercase")
<< QByteArray("aaa\nbbb\nccc\n") << QString::fromLatin1("aaa\nbbb\nccc\n")
<< QByteArray("aAa\nbBb\ncCc\n") << QString::fromLatin1("aAa\nbBb\ncCc\n")
<< 10 << 1 << Uppercase; << TestBlockSelection(0, 1, 2, 2)
<< Uppercase;
QTest::newRow("lowercase") QTest::newRow("lowercase")
<< QByteArray("AAA\nBBB\nCCC\n") << QString::fromLatin1("AAA\nBBB\nCCC\n")
<< QByteArray("AaA\nBbB\nCcC\n") << QString::fromLatin1("AaA\nBbB\nCcC\n")
<< 10 << 1 << Lowercase; << TestBlockSelection(0, 1, 2, 2)
<< Lowercase;
QTest::newRow("uppercase_leading_tabs") QTest::newRow("uppercase_leading_tabs")
<< QByteArray("\taaa\n\tbbb\n\tccc\n") << QString::fromLatin1("\taaa\n" "\tbbb\n" "\tccc\n")
<< QByteArray("\taAa\n\tbBb\n\tcCc\n") << QString::fromLatin1("\taAa\n" "\tbBb\n" "\tcCc\n")
<< 13 << 2 << Uppercase; << TestBlockSelection(0, 9, 2, 10)
<< Uppercase;
QTest::newRow("lowercase_leading_tabs") QTest::newRow("lowercase_leading_tabs")
<< QByteArray("\tAAA\n\tBBB\n\tCCC\n") << QString::fromLatin1("\tAAA\n\tBBB\n\tCCC\n")
<< QByteArray("\tAaA\n\tBbB\n\tCcC\n") << QString::fromLatin1("\tAaA\n\tBbB\n\tCcC\n")
<< 13 << 2 << Lowercase; << TestBlockSelection(0, 9, 2, 10)
<< Lowercase;
QTest::newRow("uppercase_mixed_leading_whitespace") QTest::newRow("uppercase_mixed_leading_whitespace")
<< QByteArray("\taaa\n bbbbb\n ccccc\n") << QString::fromLatin1("\taaa\n bbbbb\n ccccc\n")
<< QByteArray("\tAaa\n bbbbB\n ccccC\n") << QString::fromLatin1("\tAaa\n bbbbB\n ccccC\n")
<< 24 << 1 << Uppercase; << TestBlockSelection(0, 8, 2, 9)
<< Uppercase;
QTest::newRow("lowercase_mixed_leading_whitespace") QTest::newRow("lowercase_mixed_leading_whitespace")
<< QByteArray("\tAAA\n BBBBB\n CCCCC\n") << QString::fromLatin1("\tAAA\n BBBBB\n CCCCC\n")
<< QByteArray("\taAA\n BBBBb\n CCCCc\n") << QString::fromLatin1("\taAA\n BBBBb\n CCCCc\n")
<< 24 << 1 << Lowercase; << TestBlockSelection(0, 8, 2, 9)
<< Lowercase;
QTest::newRow("uppercase_mid_tabs1") QTest::newRow("uppercase_mid_tabs1")
<< QByteArray("a\ta\nbbbbbbbbb\nccccccccc\n") << QString::fromLatin1("a\ta\nbbbbbbbbb\nccccccccc\n")
<< QByteArray("a\ta\nbBBBBBbbb\ncCCCCCccc\n") << QString::fromLatin1("a\ta\nbBBBBBbbb\ncCCCCCccc\n")
<< 20 << 1 << Uppercase; << TestBlockSelection(0, 1, 2, 6)
<< Uppercase;
QTest::newRow("lowercase_mid_tabs2") QTest::newRow("lowercase_mid_tabs2")
<< QByteArray("AA\taa\n\t\t\nccccCCCCCC\n") << QString::fromLatin1("AA\taa\n\t\t\nccccCCCCCC\n")
<< QByteArray("Aa\taa\n\t\t\ncccccccccC\n") << QString::fromLatin1("Aa\taa\n\t\t\ncccccccccC\n")
<< 18 << 1 << Lowercase; << TestBlockSelection(0, 1, 2, 9)
<< Lowercase;
QTest::newRow("uppercase_over_line_ending") QTest::newRow("uppercase_over_line_ending")
<< QByteArray("aaaaa\nbbb\nccccc\n") << QString::fromLatin1("aaaaa\nbbb\nccccc\n")
<< QByteArray("aAAAa\nbBB\ncCCCc\n") << QString::fromLatin1("aAAAa\nbBB\ncCCCc\n")
<< 14 << 1 << Uppercase; << TestBlockSelection(0, 1, 2, 4)
<< Uppercase;
QTest::newRow("lowercase_over_line_ending") QTest::newRow("lowercase_over_line_ending")
<< QByteArray("AAAAA\nBBB\nCCCCC\n") << QString::fromLatin1("AAAAA\nBBB\nCCCCC\n")
<< QByteArray("AaaaA\nBbb\nCcccC\n") << QString::fromLatin1("AaaaA\nBbb\nCcccC\n")
<< 14 << 1 << Lowercase; << TestBlockSelection(0, 1, 2, 4)
<< Lowercase;
} }
void Internal::TextEditorPlugin::testBlockSelectionTransformation() void Internal::TextEditorPlugin::testBlockSelectionTransformation()
{ {
// fetch test data // fetch test data
QFETCH(QByteArray, input); QFETCH(QString, input);
QFETCH(QByteArray, transformedText); QFETCH(QString, transformedText);
QFETCH(int, position); QFETCH(TestBlockSelection, selection);
QFETCH(int, anchor);
QFETCH(TransFormationType, type); QFETCH(TransFormationType, type);
// open editor // open editor
Core::IEditor *editor = Core::EditorManager::openEditorWithContents( Core::IEditor *editor = Core::EditorManager::openEditorWithContents(
Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, 0, input); Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, 0, input.toLatin1());
QVERIFY(editor); QVERIFY(editor);
if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor*>(editor)) { if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor*>(editor)) {
// place cursor and enable block selection
BaseTextEditorWidget *editorWidget = textEditor->editorWidget(); BaseTextEditorWidget *editorWidget = textEditor->editorWidget();
QTextCursor cursor = editorWidget->textCursor(); editorWidget->setBlockSelection(selection.positionBlock,
cursor.setPosition(anchor); selection.positionColumn,
cursor.setPosition(position, QTextCursor::KeepAnchor); selection.anchorBlock,
editorWidget->setTextCursor(cursor); selection.anchorColumn);
editorWidget->setBlockSelection(true); editorWidget->update();
// transform blockselection // transform blockselection
switch (type) { switch (type) {
@@ -126,9 +146,355 @@ void Internal::TextEditorPlugin::testBlockSelectionTransformation()
editorWidget->lowercaseSelection(); editorWidget->lowercaseSelection();
break; break;
} }
QCOMPARE(textEditor->baseTextDocument()->plainText().toLatin1(), transformedText); QCOMPARE(textEditor->baseTextDocument()->plainText(), transformedText);
} else { }
Core::EditorManager::closeEditor(editor, false);
}
static const char text[] =
"first line\n"
"second line\n"
"third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n";
void Internal::TextEditorPlugin::testBlockSelectionInsert_data()
{
QTest::addColumn<QString>("transformedText");
QTest::addColumn<TestBlockSelection>("selection");
QTest::addColumn<QString>("insertText");
QTest::newRow("insert")
<< QString::fromLatin1(".first line\n"
".second line\n"
".third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 2, 0)
<< QString::fromLatin1(".");
QTest::newRow("insert after line end 1")
<< QString::fromLatin1("first line\n"
"second line\n"
"third. line\n"
" .\n"
"longe.st line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(2, 5, 4, 5)
<< QString::fromLatin1(".");
QTest::newRow("insert after line end 2")
<< QString::fromLatin1("first line .\n"
"second line .\n"
"third line .\n"
" .\n"
"longest line in this text .\n"
" leading space .\n"
"" "\tleading tab .\n"
"mid\t" "tab .\n"
"endtab\t .\n")
<< TestBlockSelection(0, 32, 8, 32)
<< QString::fromLatin1(".");
QTest::newRow("insert in leading tab")
<< QString::fromLatin1("first line\n"
"second line\n"
"third line\n"
"\n"
"lo.ngest line in this text\n"
" . leading space\n"
" . leading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(4, 2, 6, 2)
<< QString::fromLatin1(".");
QTest::newRow("insert in middle tab")
<< QString::fromLatin1("first line\n"
"second line\n"
"third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
" . leading tab\n"
"mid . tab\n"
"endta.b\t\n")
<< TestBlockSelection(6, 5, 8, 5)
<< QString::fromLatin1(".");
QTest::newRow("insert same block count with all blocks same length")
<< QString::fromLatin1(".first line\n"
".second line\n"
".third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 2, 0)
<< QString::fromLatin1(".\n.\n.");
QTest::newRow("insert same block count with all blocks different length")
<< QString::fromLatin1(". first line\n"
".. second line\n"
"...third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 2, 0)
<< QString::fromLatin1(".\n..\n...");
QTest::newRow("insert same block count with some blocks containing tabs")
<< QString::fromLatin1(". first line\n"
".\t second line\n"
".\t.third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 2, 0)
<< QString::fromLatin1(".\n.\t\n.\t.");
QTest::newRow("insert same block count with some blocks containing tabs in mid line")
<< QString::fromLatin1("fi. rst line\n"
"se.\t cond line\n"
"th.\t.ird line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 2, 2, 2)
<< QString::fromLatin1(".\n.\t\n.\t.");
QTest::newRow("insert different block count with all blocks same length")
<< QString::fromLatin1(".first line\n"
".\n"
".second line\n"
".\n"
".third line\n"
".\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 2, 0)
<< QString::fromLatin1(".\n.");
QTest::newRow("insert different block count with all blocks different length")
<< QString::fromLatin1(". first line\n"
"..\n"
". second line\n"
"..\n"
". third line\n"
"..\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 2, 0)
<< QString::fromLatin1(".\n..");
QTest::newRow("insert different block count with some blocks containing tabs")
<< QString::fromLatin1(". first line\n"
".\t \n"
".\t.\n"
". second line\n"
".\t \n"
".\t.\n"
"third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 0, 1, 0)
<< QString::fromLatin1(".\n.\t\n.\t.");
QTest::newRow("insert different block count with some blocks containing tabs in mid line")
<< QString::fromLatin1("fi. rst line\n"
" .\t \n"
" .\t.\n"
"se. cond line\n"
" .\t \n"
" .\t.\n"
"third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 2, 1, 2)
<< QString::fromLatin1(".\n.\t\n.\t.");
}
void Internal::TextEditorPlugin::testBlockSelectionInsert()
{
// fetch test data
QFETCH(QString, transformedText);
QFETCH(TestBlockSelection, selection);
QFETCH(QString, insertText);
// open editor
Core::IEditor *editor = Core::EditorManager::openEditorWithContents(
Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, 0, text);
QVERIFY(editor);
if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor*>(editor)) {
BaseTextEditorWidget *editorWidget = textEditor->editorWidget();
editorWidget->setBlockSelection(selection.positionBlock,
selection.positionColumn,
selection.anchorBlock,
selection.anchorColumn);
editorWidget->update();
editorWidget->insertPlainText(insertText);
QCOMPARE(textEditor->baseTextDocument()->plainText(), transformedText);
}
Core::EditorManager::closeEditor(editor, false);
}
void Internal::TextEditorPlugin::testBlockSelectionRemove_data()
{
QTest::addColumn<QString>("transformedText");
QTest::addColumn<TestBlockSelection>("selection");
QTest::newRow("Delete")
<< QString::fromLatin1("first ine\n"
"second ine\n"
"third ine\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 7, 2, 8);
QTest::newRow("Delete All")
<< QString::fromLatin1("\n\n\n\n\n\n\n\n\n")
<< TestBlockSelection(0, 0, 8, 30);
QTest::newRow("Delete Inside Tab")
<< QString::fromLatin1("first line\n"
"second line\n"
"third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
" leading tab\n"
"mi\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(5, 2, 7, 3);
QTest::newRow("Delete around Tab")
<< QString::fromLatin1("first line\n"
"second line\n"
"third line\n"
"\n"
"longest line in this text\n"
" ng space\n"
" eading tab\n"
"miab\n"
"endtab\t\n")
<< TestBlockSelection(5, 2, 7, 9);
QTest::newRow("Delete behind text")
<< QString::fromLatin1("first line\n"
"second line\n"
"third line\n"
"\n"
"longest line in this text\n"
" leading space\n"
"" "\tleading tab\n"
"mid\t" "tab\n"
"endtab\t\n")
<< TestBlockSelection(0, 30, 8, 35);
}
void Internal::TextEditorPlugin::testBlockSelectionRemove()
{
// fetch test data
QFETCH(QString, transformedText);
QFETCH(TestBlockSelection, selection);
// open editor
Core::IEditor *editor = Core::EditorManager::openEditorWithContents(
Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, 0, text);
QVERIFY(editor);
if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor*>(editor)) {
BaseTextEditorWidget *editorWidget = textEditor->editorWidget();
editorWidget->setBlockSelection(selection.positionBlock,
selection.positionColumn,
selection.anchorBlock,
selection.anchorColumn);
editorWidget->update();
editorWidget->insertPlainText(QString());
QCOMPARE(textEditor->baseTextDocument()->plainText(), transformedText);
}
Core::EditorManager::closeEditor(editor, false);
}
void Internal::TextEditorPlugin::testBlockSelectionCopy_data()
{
QTest::addColumn<QString>("copiedText");
QTest::addColumn<TestBlockSelection>("selection");
QTest::newRow("copy")
<< QString::fromLatin1("lin\n"
"lin\n"
"lin")
<< TestBlockSelection(0, 7, 2, 10);
QTest::newRow("copy over line end")
<< QString::fromLatin1("ond line \n"
"rd line \n"
" ")
<< TestBlockSelection(1, 3, 3, 15);
QTest::newRow("copy inside tab")
<< QString::fromLatin1("ond line \n"
"rd line \n"
" ")
<< TestBlockSelection(1, 3, 3, 15);
QTest::newRow("copy start in tab")
<< QString::fromLatin1("gest lin\n"
" leading\n"
" lea")
<< TestBlockSelection(4, 3, 6, 11);
QTest::newRow("copy around tab")
<< QString::fromLatin1(" leadin\n"
" le\n"
"d\tta")
<< TestBlockSelection(5, 2, 7, 10);
}
void Internal::TextEditorPlugin::testBlockSelectionCopy()
{
// fetch test data
QFETCH(QString, copiedText);
QFETCH(TestBlockSelection, selection);
// open editor
Core::IEditor *editor = Core::EditorManager::openEditorWithContents(
Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, 0, text);
QVERIFY(editor);
if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor*>(editor)) {
BaseTextEditorWidget *editorWidget = textEditor->editorWidget();
editorWidget->setBlockSelection(selection.positionBlock,
selection.positionColumn,
selection.anchorBlock,
selection.anchorColumn);
editorWidget->update();
editorWidget->copy();
QCOMPARE(qApp->clipboard()->text(), copiedText);
} }
Core::EditorManager::closeEditor(editor, false); Core::EditorManager::closeEditor(editor, false);
} }

3
src/plugins/texteditor/codeassist/codeassistant.cpp
View File

@@ -248,6 +248,9 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
{ {
QTC_ASSERT(!isWaitingForProposal(), return); QTC_ASSERT(!isWaitingForProposal(), return);
if (m_textEditor->editorWidget()->hasBlockSelection())
return; // TODO
if (!provider) { if (!provider) {
if (kind == Completion) if (kind == Completion)
provider = m_completionProvider; provider = m_completionProvider;

12
src/plugins/texteditor/tabsettings.cpp
View File

@@ -213,6 +213,18 @@ int TabSettings::positionAtColumn(const QString &text, int column, int *offset)
return i; return i;
} }
int TabSettings::columnCountForText(const QString &text, int startColumn) const
{
int column = startColumn;
for (int i = 0; i < text.size(); ++i) {
if (text.at(i) == QLatin1Char('\t'))
column = column - (column % m_tabSize) + m_tabSize;
else
++column;
}
return column - startColumn;
}
int TabSettings::spacesLeftFromPosition(const QString &text, int position) int TabSettings::spacesLeftFromPosition(const QString &text, int position)
{ {
int i = position; int i = position;

1
src/plugins/texteditor/tabsettings.h
View File

@@ -70,6 +70,7 @@ public:
int lineIndentPosition(const QString &text) const; int lineIndentPosition(const QString &text) const;
int columnAt(const QString &text, int position) const; int columnAt(const QString &text, int position) const;
int positionAtColumn(const QString &text, int column, int *offset = 0) const; int positionAtColumn(const QString &text, int column, int *offset = 0) const;
int columnCountForText(const QString &text, int startColumn = 0) const;
int indentedColumn(int column, bool doIndent = true) const; int indentedColumn(int column, bool doIndent = true) const;
QString indentationString(int startColumn, int targetColumn, const QTextBlock &currentBlock = QTextBlock()) const; QString indentationString(int startColumn, int targetColumn, const QTextBlock &currentBlock = QTextBlock()) const;
QString indentationString(const QString &text) const; QString indentationString(const QString &text) const;

25
src/plugins/texteditor/texteditorplugin.h
View File

@@ -73,14 +73,6 @@ private slots:
void updateVariable(const QByteArray &variable); void updateVariable(const QByteArray &variable);
void updateCurrentSelection(const QString &text); void updateCurrentSelection(const QString &text);
#ifdef WITH_TESTS
void testSnippetParsing_data();
void testSnippetParsing();
void testBlockSelectionTransformation_data();
void testBlockSelectionTransformation();
#endif
private: private:
static TextEditorPlugin *m_instance; static TextEditorPlugin *m_instance;
TextEditorSettings *m_settings; TextEditorSettings *m_settings;
@@ -89,6 +81,23 @@ private:
Core::SearchResultWindow *m_searchResultWindow; Core::SearchResultWindow *m_searchResultWindow;
OutlineFactory *m_outlineFactory; OutlineFactory *m_outlineFactory;
BaseTextMarkRegistry *m_baseTextMarkRegistry; BaseTextMarkRegistry *m_baseTextMarkRegistry;
#ifdef WITH_TESTS
private slots:
void testSnippetParsing_data();
void testSnippetParsing();
void testBlockSelectionTransformation_data();
void testBlockSelectionTransformation();
void testBlockSelectionInsert_data();
void testBlockSelectionInsert();
void testBlockSelectionRemove_data();
void testBlockSelectionRemove();
void testBlockSelectionCopy_data();
void testBlockSelectionCopy();
#endif
}; };
} // namespace Internal } // namespace Internal