walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Codeeditor: multiline comment fix (#4253)

This commit is contained in:
Maksim Derbasov 2022-07-08 13:37:05 +03:00 committed by GitHub
parent 89a9e5ecc6
commit a65f6952dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gui/codeeditor.cpp
View File

@ -45,26 +45,26 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "case" << "case"
<< "catch" << "catch"
<< "char" << "char"
<< "char8_­t" << "char8_t"
<< "char16_­t" << "char16_t"
<< "char32_­t" << "char32_t"
<< "class" << "class"
<< "concept" << "concept"
<< "const" << "const"
<< "consteval" << "consteval"
<< "constexpr" << "constexpr"
<< "constinit" << "constinit"
<< "const_­cast" << "const_cast"
<< "continue" << "continue"
<< "co_­await" << "co_await"
<< "co_­return" << "co_return"
<< "co_­yield" << "co_yield"
<< "decltype" << "decltype"
<< "default" << "default"
<< "delete" << "delete"
<< "do" << "do"
<< "double" << "double"
<< "dynamic_­cast" << "dynamic_cast"
<< "else" << "else"
<< "enum" << "enum"
<< "explicit" << "explicit"
@ -92,19 +92,19 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "private" << "private"
<< "protected" << "protected"
<< "public" << "public"
<< "reinterpret_­cast" << "reinterpret_cast"
<< "requires" << "requires"
<< "return" << "return"
<< "short" << "short"
<< "signed" << "signed"
<< "static" << "static"
<< "static_­assert" << "static_assert"
<< "static_­cast" << "static_cast"
<< "struct" << "struct"
<< "switch" << "switch"
<< "template" << "template"
<< "this" << "this"
<< "thread_­local" << "thread_local"
<< "throw" << "throw"
<< "true" << "true"
<< "try" << "try"
@ -116,7 +116,7 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "virtual" << "virtual"
<< "void" << "void"
<< "volatile" << "volatile"
<< "wchar_­t" << "wchar_t"
<< "while"; << "while";
for (const QString &pattern : keywordPatterns) { for (const QString &pattern : keywordPatterns) {
rule.pattern = QRegularExpression("\\b" + pattern + "\\b"); rule.pattern = QRegularExpression("\\b" + pattern + "\\b");
@ -157,7 +157,9 @@ Highlighter::Highlighter(QTextDocument *parent,
mSymbolFormat.setBackground(mWidgetStyle->symbolBGColor); mSymbolFormat.setBackground(mWidgetStyle->symbolBGColor);
mSymbolFormat.setFontWeight(mWidgetStyle->symbolWeight); mSymbolFormat.setFontWeight(mWidgetStyle->symbolWeight);
mCommentStartExpression = QRegularExpression("/\\*"); // We use negative lookbehind assertion `(?<!/)`
// to ignore case: single line comment and line of asterisk
mCommentStartExpression = QRegularExpression("(?<!/)/\\*");
mCommentEndExpression = QRegularExpression("\\*/"); mCommentEndExpression = QRegularExpression("\\*/");
} }