dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

change auto list seq to 1 after indented or unindented

Browse Source
This commit is contained in:
Le Tan 2017-04-26 18:53:08 +08:00
parent 2a29456f45
commit 8899a374a8
2 changed files with 79 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/vmdeditoperations.cpp
View File

@ -389,9 +389,15 @@ bool VMdEditOperations::handleKeyTab(QKeyEvent *p_event)
} else {
// If it is a Tab key following auto list, increase the indent level.
QTextBlock block = cursor.block();
if (m_autoIndentPos == cursor.position() && isListBlock(block)) {
int seq = -1;
if (m_autoIndentPos == cursor.position() && isListBlock(block, &seq)) {
QTextCursor blockCursor(block);
blockCursor.beginEditBlock();
blockCursor.insertText(text);
if (seq != -1) {
changeListBlockSeqNumber(block, 1);
}
blockCursor.endEditBlock();
// Change m_autoIndentPos to let it can be repeated.
m_autoIndentPos = m_editor->textCursor().position();
} else {
@ -420,12 +426,17 @@ bool VMdEditOperations::handleKeyBackTab(QKeyEvent *p_event)
QTextBlock endBlock = doc->findBlock(cursor.selectionEnd());
bool continueAutoIndent = false;
if (cursor.position() == m_autoIndentPos && isListBlock(block) &&
int seq = -1;
if (cursor.position() == m_autoIndentPos && isListBlock(block, &seq) &&
!cursor.hasSelection()) {
continueAutoIndent = true;
}
int endBlockNum = endBlock.blockNumber();
cursor.beginEditBlock();
if (continueAutoIndent && seq != -1) {
changeListBlockSeqNumber(block, 1);
}
for (; block.isValid() && block.blockNumber() <= endBlockNum;
block = block.next()) {
QTextCursor blockCursor(block);
@ -797,12 +808,67 @@ bool VMdEditOperations::insertListMarkAsPreviousLine()
return ret;
}
bool VMdEditOperations::isListBlock(const QTextBlock &p_block)
bool VMdEditOperations::isListBlock(const QTextBlock &p_block, int *p_seq)
{
QString text = p_block.text();
QRegExp regExp("^\\s*(-|\\d+\\.)\\s");
if (p_seq) {
*p_seq = -1;
}
int regIdx = regExp.indexIn(text);
return regIdx != -1;
if (regIdx == -1) {
return false;
}
V_ASSERT(regExp.captureCount() == 1);
QString markText = regExp.capturedTexts()[1];
if (markText != "-") {
V_ASSERT(markText.endsWith('.'));
bool ok = false;
int num = markText.left(markText.size() - 1).toInt(&ok, 10);
V_ASSERT(ok);
if (p_seq) {
*p_seq = num;
}
}
return true;
}
void VMdEditOperations::changeListBlockSeqNumber(QTextBlock &p_block, int p_seq)
{
QString text = p_block.text();
QRegExp regExp("^(\\s*)(\\d+)\\.\\s");
int idx = regExp.indexIn(text);
if (idx == -1 || regExp.captureCount() != 2) {
return;
}
int oriSeq = -1;
bool ok = false;
oriSeq = regExp.capturedTexts()[2].toInt(&ok);
if (ok && oriSeq == p_seq) {
return;
}
QTextCursor cursor(p_block);
bool ret = cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor,
regExp.capturedTexts()[1].size());
if (!ret) {
return;
}
ret = cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor,
regExp.capturedTexts()[2].size());
if (!ret) {
return;
}
cursor.removeSelectedText();
cursor.insertText(QString::number(p_seq));
}
bool VMdEditOperations::isSpaceToBlockStart(const QTextBlock &p_block, int p_posInBlock)

10
src/vmdeditoperations.h
View File

@ -50,10 +50,18 @@ private:
bool insertNewBlockWithIndent();
bool insertListMarkAsPreviousLine();
void deleteIndentAndListMark();
bool isListBlock(const QTextBlock &p_block);
// Check if @p_block is a auto list block.
// @p_seq will be the seq number of the ordered list, or -1.
// Returns true if it is an auto list block.
bool isListBlock(const QTextBlock &p_block, int *p_seq = NULL);
// If the start of @p_block to postition @p_posInBlock are spaces.
bool isSpaceToBlockStart(const QTextBlock &p_block, int p_posInBlock);
// Change the sequence number of a list block.
void changeListBlockSeqNumber(QTextBlock &p_block, int p_seq);
QTimer *m_pendingTimer;
// The cursor position after auto indent or auto list.
// It will be -1 if last key press do not trigger the auto indent or auto list.