Skip to content

Codeeditor: multi-line comment fix #4253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orbitcowboy merged 1 commit into from
Jul 8, 2022
Merged

Codeeditor: multi-line comment fix #4253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions gui/codeeditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "case"
<< "catch"
<< "char"
<< "char8_­t"
<< "char16_­t"
<< "char32_­t"
<< "char8_t"
<< "char16_t"
<< "char32_t"
<< "class"
<< "concept"
<< "const"
<< "consteval"
<< "constexpr"
<< "constinit"
<< "const_­cast"
<< "const_cast"
<< "continue"
<< "co_­await"
<< "co_­return"
<< "co_­yield"
<< "co_await"
<< "co_return"
<< "co_yield"
<< "decltype"
<< "default"
<< "delete"
<< "do"
<< "double"
<< "dynamic_­cast"
<< "dynamic_cast"
<< "else"
<< "enum"
<< "explicit"
Expand Down Expand Up @@ -92,19 +92,19 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "private"
<< "protected"
<< "public"
<< "reinterpret_­cast"
<< "reinterpret_cast"
<< "requires"
<< "return"
<< "short"
<< "signed"
<< "static"
<< "static_­assert"
<< "static_­cast"
<< "static_assert"
<< "static_cast"
<< "struct"
<< "switch"
<< "template"
<< "this"
<< "thread_­local"
<< "thread_local"
<< "throw"
<< "true"
<< "try"
Expand All @@ -116,7 +116,7 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "virtual"
<< "void"
<< "volatile"
<< "wchar_­t"
<< "wchar_t"
<< "while";
for (const QString &pattern : keywordPatterns) {
rule.pattern = QRegularExpression("\\b" + pattern + "\\b");
Expand Down Expand Up @@ -157,7 +157,9 @@ Highlighter::Highlighter(QTextDocument *parent,
mSymbolFormat.setBackground(mWidgetStyle->symbolBGColor);
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("\\*/");
}

Expand Down