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

PegMarkdownHighlighter: dynamic fast parse timer interval

Browse Source
This commit is contained in:
Le Tan 2018-08-22 20:01:50 +08:00
parent d4daf32f20
commit e1091e0d80
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pegmarkdownhighlighter.cpp
View File

@ -23,7 +23,8 @@ PegMarkdownHighlighter::PegMarkdownHighlighter(QTextDocument *p_doc, VMdEditor *
m_parser(NULL),
m_parserExts(pmh_EXT_NOTES | pmh_EXT_STRIKE | pmh_EXT_FRONTMATTER | pmh_EXT_MARK),
m_parseInterval(50),
m_notifyHighlightComplete(false)
m_notifyHighlightComplete(false),
m_fastParseInterval(30)
{
}
@ -74,7 +75,7 @@ void PegMarkdownHighlighter::init(const QVector<HighlightingStyle> &p_styles,
m_fastParseTimer = new QTimer(this);
m_fastParseTimer->setSingleShot(true);
m_fastParseTimer->setInterval(100);
m_fastParseTimer->setInterval(m_fastParseInterval);
connect(m_fastParseTimer, &QTimer::timeout,
this, [this]() {
startFastParse(m_fastParseInfo.m_position,
@ -103,6 +104,8 @@ void PegMarkdownHighlighter::init(const QVector<HighlightingStyle> &p_styles,
connect(m_editor->verticalScrollBar(), &QScrollBar::valueChanged,
m_scrollRehighlightTimer, static_cast<void(QTimer::*)()>(&QTimer::start));
m_contentChangeTime.start();
}
// Just use parse results to highlight block.
@ -189,6 +192,16 @@ void PegMarkdownHighlighter::highlightBlock(const QString &p_text)
}
}
inline
static bool containSpecialChar(const QString &p_str)
{
QChar fi = p_str[0];
QChar la = p_str[p_str.size() - 1];
return fi == '#'
|| la == '`' || la == '$' || la == '*' || la == '_';
}
bool PegMarkdownHighlighter::preHighlightSingleFormatBlock(const QVector<QVector<HLUnit>> &p_highlights,
int p_blockNum,
const QString &p_text,
@ -210,7 +223,9 @@ bool PegMarkdownHighlighter::preHighlightSingleFormatBlock(const QVector<QVector
const QVector<HLUnit> &units = p_highlights[p_blockNum];
if (units.size() == 1) {
const HLUnit &unit = units[0];
if (unit.start == 0 && (int)unit.length < sz) {
if (unit.start == 0
&& (int)unit.length < sz
&& (p_forced || containSpecialChar(p_text))) {
setFormat(0, sz, m_styles[unit.styleIndex].format);
return true;
}
@ -269,11 +284,15 @@ void PegMarkdownHighlighter::highlightBlockOne(const QVector<HLUnit> &p_units)
}
}
#define KEY_PRESS_INTERVAL 50
// highlightBlock() will be called before this function.
void PegMarkdownHighlighter::handleContentsChange(int p_position, int p_charsRemoved, int p_charsAdded)
{
Q_UNUSED(p_position);
int interval = m_contentChangeTime.restart();
if (p_charsRemoved == 0 && p_charsAdded == 0) {
return;
}
@ -286,7 +305,7 @@ void PegMarkdownHighlighter::handleContentsChange(int p_position, int p_charsRem
m_fastParseInfo.m_position = p_position;
m_fastParseInfo.m_charsRemoved = p_charsRemoved;
m_fastParseInfo.m_charsAdded = p_charsAdded;
m_fastParseTimer->start();
m_fastParseTimer->start(interval < KEY_PRESS_INTERVAL ? 100 : m_fastParseInterval);
}
// We still need a timer to start a complete parse.
@ -312,7 +331,10 @@ void PegMarkdownHighlighter::startFastParse(int p_position, int p_charsRemoved,
if (firstBlockNum == -1) {
// We could not let m_fastResult NULL here.
clearFastParseResult();
m_fastParseInterval = 100;
return;
} else {
m_fastParseInterval = (lastBlockNum - firstBlockNum) < 5 ? 0 : 30;
}
QString text;
@ -741,7 +763,7 @@ void PegMarkdownHighlighter::getFastParseBlockRange(int p_position,
int &p_firstBlock,
int &p_lastBlock) const
{
const int maxNumOfBlocks = 10;
const int maxNumOfBlocks = 15;
int charsChanged = p_charsRemoved + p_charsAdded;
QTextBlock firstBlock = m_doc->findBlock(p_position);

7
src/pegmarkdownhighlighter.h
View File

@ -3,6 +3,7 @@
#include <QSyntaxHighlighter>
#include <QTextCharFormat>
#include <QTime>
#include "vtextblockdata.h"
#include "markdownhighlighterdata.h"
@ -212,6 +213,12 @@ private:
QSet<int> m_singleFormatBlocks;
bool m_notifyHighlightComplete;
// Time since last content change.
QTime m_contentChangeTime;
// Interval for fast parse timer.
int m_fastParseInterval;
};
inline const QVector<VElementRegion> &PegMarkdownHighlighter::getHeaderRegions() const

5
src/vmdeditor.cpp
View File

@ -1469,7 +1469,7 @@ int VMdEditor::lineNumberAreaWidth() const
void VMdEditor::initLinkAndPreviewMenu(QAction *p_before, QMenu *p_menu, const QPoint &p_pos)
{
QTextCursor cursor = cursorForPosition(p_pos);
int pos = cursor.position();
const int pos = cursor.position();
QTextBlock block = cursor.block();
const QString text(block.text());
@ -1554,6 +1554,7 @@ void VMdEditor::initLinkAndPreviewMenu(QAction *p_before, QMenu *p_menu, const Q
QRegExp regExp2(VUtils::c_linkRegExp);
QString linkText;
int p = 0;
const int pib = pos - block.position();
while (p < text.size()) {
int idx = text.indexOf(regExp2, p);
if (idx == -1) {
@ -1561,7 +1562,7 @@ void VMdEditor::initLinkAndPreviewMenu(QAction *p_before, QMenu *p_menu, const Q
}
p = idx + regExp2.matchedLength();
if (pos >= idx && pos < p) {
if (pib >= idx && pib < p) {
linkText = regExp2.cap(2);
break;
}