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

FakeVim: Port more from QRegExp to QRegularExpression

Browse Source 
QRegExp will not be available in Qt 6.

Task-number: QTCREATORBUG-24098
Change-Id: Ia1aec515615ecaf8e92ae1a3a1dad92cb999bfb1
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-22 15:40:34 +02:00
parent c7cde7126f
commit 86b7e287d6
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,7 +421,7 @@ static QRegExp vimPatternToQtPattern(QString needle, bool ignoreCaseOption, bool
*/ */
// FIXME: Option smartcase should be used only if search was typed by user. // FIXME: Option smartcase should be used only if search was typed by user.
bool ignorecase = ignoreCaseOption bool ignorecase = ignoreCaseOption
&& !(smartCaseOption && needle.contains(QRegExp("[A-Z]"))); && !(smartCaseOption && needle.contains(QRegularExpression("[A-Z]")));
QString pattern; QString pattern;
pattern.reserve(2 * needle.size()); pattern.reserve(2 * needle.size());
@@ -2633,7 +2633,7 @@ void FakeVimHandler::Private::commitInsertState()
lastInsertion.prepend(QString("<DELETE>").repeated(insertState.deletes)); lastInsertion.prepend(QString("<DELETE>").repeated(insertState.deletes));
// Remove indentation. // Remove indentation.
lastInsertion.replace(QRegExp("(^|\n)[\\t ]+"), "\\1"); lastInsertion.replace(QRegularExpression("(^|\n)[\\t ]+"), "\\1");
} }
void FakeVimHandler::Private::invalidateInsertState() void FakeVimHandler::Private::invalidateInsertState()
@@ -3920,7 +3920,7 @@ bool FakeVimHandler::Private::handleMovement(const Input &input)
QString needle; QString needle;
QTextCursor tc = m_cursor; QTextCursor tc = m_cursor;
tc.select(QTextCursor::WordUnderCursor); tc.select(QTextCursor::WordUnderCursor);
needle = QRegExp::escape(tc.selection().toPlainText()); needle = QRegularExpression::escape(tc.selection().toPlainText());
if (!g.gflag) { if (!g.gflag) {
needle.prepend("\\<"); needle.prepend("\\<");
needle.append("\\>"); needle.append("\\>");
@@ -4605,7 +4605,7 @@ bool FakeVimHandler::Private::handleReplaceSubMode(const Input &input)
++range.endPos; ++range.endPos;
// Replace each character but preserve lines. // Replace each character but preserve lines.
transformText(range, [&c](const QString &text) { transformText(range, [&c](const QString &text) {
return QString(text).replace(QRegExp("[^\\n]"), c); return QString(text).replace(QRegularExpression("[^\\n]"), c);
}); });
} else if (count() <= rightDist()) { } else if (count() <= rightDist()) {
pushUndoState(); pushUndoState();
@@ -5434,7 +5434,7 @@ bool FakeVimHandler::Private::parseExCommand(QString *line, ExCommand *cmd)
cmd->cmd = line->mid(0, i).trimmed(); cmd->cmd = line->mid(0, i).trimmed();
// command arguments starts with first non-letter character // command arguments starts with first non-letter character
cmd->args = cmd->cmd.section(QRegExp("(?=[^a-zA-Z])"), 1); cmd->args = cmd->cmd.section(QRegularExpression("(?=[^a-zA-Z])"), 1);
if (!cmd->args.isEmpty()) { if (!cmd->args.isEmpty()) {
cmd->cmd.chop(cmd->args.size()); cmd->cmd.chop(cmd->args.size());
cmd->args = cmd->args.trimmed(); cmd->args = cmd->args.trimmed();
@@ -5454,7 +5454,7 @@ bool FakeVimHandler::Private::parseExCommand(QString *line, ExCommand *cmd)
bool FakeVimHandler::Private::parseLineRange(QString *line, ExCommand *cmd) bool FakeVimHandler::Private::parseLineRange(QString *line, ExCommand *cmd)
{ {
// remove leading colons and spaces // remove leading colons and spaces
line->remove(QRegExp("^\\s*(:+\\s*)*")); line->remove(QRegularExpression("^\\s*(:+\\s*)*"));
// special case ':!...' (use invalid range) // special case ':!...' (use invalid range)
if (line->startsWith('!')) { if (line->startsWith('!')) {
@@ -5678,8 +5678,8 @@ bool FakeVimHandler::Private::handleExMapCommand(const ExCommand &cmd0) // :map
break; break;
} }
const QString lhs = args.section(QRegExp("\\s+"), 0, 0); const QString lhs = args.section(QRegularExpression("\\s+"), 0, 0);
const QString rhs = args.section(QRegExp("\\s+"), 1); const QString rhs = args.section(QRegularExpression("\\s+"), 1);
if ((rhs.isNull() && type != Unmap) || (!rhs.isNull() && type == Unmap)) { if ((rhs.isNull() && type != Unmap) || (!rhs.isNull() && type == Unmap)) {
// FIXME: Dump mappings here. // FIXME: Dump mappings here.
//qDebug() << g.mappings; //qDebug() << g.mappings;
@@ -5954,7 +5954,7 @@ bool FakeVimHandler::Private::handleExWriteCommand(const ExCommand &cmd)
{ {
// Note: The cmd.args.isEmpty() case is handled by handleExPluginCommand. // Note: The cmd.args.isEmpty() case is handled by handleExPluginCommand.
// :w, :x, :wq, ... // :w, :x, :wq, ...
//static QRegExp reWrite("^[wx]q?a?!?( (.*))?$"); //static QRegularExpression reWrite("^[wx]q?a?!?( (.*))?$");
if (cmd.cmd != "w" && cmd.cmd != "x" && cmd.cmd != "wq") if (cmd.cmd != "w" && cmd.cmd != "x" && cmd.cmd != "wq")
return false; return false;
@@ -8396,17 +8396,22 @@ bool FakeVimHandler::Private::changeNumberTextObject(int count)
const int posMin = m_cursor.positionInBlock() + 1; const int posMin = m_cursor.positionInBlock() + 1;
// find first decimal, hexadecimal or octal number under or after cursor position // find first decimal, hexadecimal or octal number under or after cursor position
QRegExp re("(0[xX])(0*[0-9a-fA-F]+)|(0)(0*[0-7]+)(?=\\D|$)|(\\d+)"); QRegularExpression re("(0[xX])(0*[0-9a-fA-F]+)|(0)(0*[0-7]+)(?=\\D|$)|(\\d+)");
int pos = 0; QRegularExpressionMatch match;
while ((pos = re.indexIn(lineText, pos)) != -1 && pos + re.matchedLength() < posMin) QRegularExpressionMatchIterator it = re.globalMatch(lineText);
++pos; while (true) {
if (pos == -1) if (!it.hasNext())
return false; return false;
int len = re.matchedLength(); match = it.next();
QString prefix = re.cap(1) + re.cap(3); if (match.capturedEnd() >= posMin)
break;
}
int pos = match.capturedStart();
int len = match.capturedLength();
QString prefix = match.captured(1) + match.captured(3);
bool hex = prefix.length() >= 2 && (prefix[1].toLower() == 'x'); bool hex = prefix.length() >= 2 && (prefix[1].toLower() == 'x');
bool octal = !hex && !prefix.isEmpty(); bool octal = !hex && !prefix.isEmpty();
const QString num = hex ? re.cap(2) : octal ? re.cap(4) : re.cap(5); const QString num = hex ? match.captured(2) : octal ? match.captured(4) : match.captured(5);
// parse value // parse value
bool ok; bool ok;