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

FakeVim: Avoid using invalid regular expressions

Browse Source 
Print a warning in case of an invalid regular expression
and do not apply it to the settings.
This silently drops invalid regular expressions entered
and restored from settings.

Change-Id: I2f7686066541cf2307cf7cf96b3c6f89f6a677d8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Christian Stenger
2023-04-26 12:14:12 +02:00
parent ec0462748b
commit a5e5058c41
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,12 +605,17 @@ FakeVimExCommandsMappings::FakeVimExCommandsMappings()
m_commandBox = new QGroupBox(Tr::tr("Ex Command"), this); m_commandBox = new QGroupBox(Tr::tr("Ex Command"), this);
m_commandBox->setEnabled(false); m_commandBox->setEnabled(false);
auto boxLayout = new QHBoxLayout(m_commandBox); auto commandBoxLayout = new QVBoxLayout(m_commandBox);
auto boxLayout = new QHBoxLayout;
commandBoxLayout->addLayout(boxLayout);
m_commandEdit = new FancyLineEdit(m_commandBox); m_commandEdit = new FancyLineEdit(m_commandBox);
m_commandEdit->setFiltering(true); m_commandEdit->setFiltering(true);
m_commandEdit->setPlaceholderText(QString()); m_commandEdit->setPlaceholderText(QString());
connect(m_commandEdit, &FancyLineEdit::textChanged, connect(m_commandEdit, &FancyLineEdit::textChanged,
this, &FakeVimExCommandsMappings::commandChanged); this, &FakeVimExCommandsMappings::commandChanged);
m_commandEdit->setValidationFunction([](FancyLineEdit *e, QString *){
return QRegularExpression(e->text()).isValid();
});
auto resetButton = new QPushButton(Tr::tr("Reset"), m_commandBox); auto resetButton = new QPushButton(Tr::tr("Reset"), m_commandBox);
resetButton->setToolTip(Tr::tr("Reset to default.")); resetButton->setToolTip(Tr::tr("Reset to default."));
connect(resetButton, &QPushButton::clicked, connect(resetButton, &QPushButton::clicked,
@@ -619,6 +624,12 @@ FakeVimExCommandsMappings::FakeVimExCommandsMappings()
boxLayout->addWidget(m_commandEdit); boxLayout->addWidget(m_commandEdit);
boxLayout->addWidget(resetButton); boxLayout->addWidget(resetButton);
auto infoLabel = new InfoLabel(Tr::tr("Invalid regular expression."), InfoLabel::Error);
infoLabel->setVisible(false);
connect(m_commandEdit, &FancyLineEdit::validChanged, [infoLabel](bool valid){
infoLabel->setVisible(!valid);
});
commandBoxLayout->addWidget(infoLabel);
layout()->addWidget(m_commandBox); layout()->addWidget(m_commandBox);
QMap<QString, QTreeWidgetItem *> sections; QMap<QString, QTreeWidgetItem *> sections;
@@ -675,7 +686,9 @@ ExCommandMap FakeVimExCommandsMappings::exCommandMapFromWidget()
if ((regex.isEmpty() && pattern.isEmpty()) if ((regex.isEmpty() && pattern.isEmpty())
|| (!regex.isEmpty() && pattern == regex)) || (!regex.isEmpty() && pattern == regex))
continue; continue;
map[name] = QRegularExpression(regex); const QRegularExpression expression(regex);
if (expression.isValid())
map[name] = expression;
} }
} }
return map; return map;
@@ -1285,7 +1298,9 @@ void FakeVimPluginPrivate::readSettings()
settings->setArrayIndex(i); settings->setArrayIndex(i);
const QString id = settings->value(idKey).toString(); const QString id = settings->value(idKey).toString();
const QString re = settings->value(reKey).toString(); const QString re = settings->value(reKey).toString();
m_exCommandMap[id] = QRegularExpression(re); const QRegularExpression regEx(re);
if (regEx.isValid())
m_exCommandMap[id] = regEx;
} }
settings->endArray(); settings->endArray();