Simplify a regex and fix a typo

- The usage of `|` is wrong
- It's `mWhiteListQuotes` and not `mWhiteListQoutes`
- Replace weird usage of `{}`-based quantifiers
7220-lua-add-a-general-purpose-lexical-parser
jvoisin 2 years ago
parent 94259317bb
commit 853ca5827e

@ -55,7 +55,7 @@ CSVWorld::ScriptEdit::ScriptEdit(const CSMDoc::Document& document, ScriptHighlig
, mTabCharCount(4)
, mMarkOccurrences(true)
, mDocument(document)
, mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", QRegularExpression::CaseInsensitiveOption)
, mWhiteListQuotes("^[a-zA-Z_][a-zA-Z0-9_]*$")
{
wrapLines(false);
setTabWidth();
@ -188,7 +188,7 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote(const std::string& id) const
{
const QString string(QString::fromUtf8(id.c_str()));
// I'm not quite sure when do we need to put quotes. To be safe we will use quotes for anything other than…
return !(string.contains(mWhiteListQoutes));
return !(string.contains(mWhiteListQuotes));
}
void CSVWorld::ScriptEdit::setTabWidth()

@ -95,7 +95,7 @@ namespace CSVWorld
private:
QVector<CSMWorld::UniversalId::Type> mAllowedTypes;
const CSMDoc::Document& mDocument;
const QRegularExpression mWhiteListQoutes;
const QRegularExpression mWhiteListQuotes;
void dragEnterEvent(QDragEnterEvent* event) override;

Loading…
Cancel
Save