rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: Escape suquences like \uxxxx and \Uxxxxxxxx in strings are not correctly highlighted.

This commit is contained in:
Roy Qu 2022-11-11 09:00:06 +08:00
parent 36f94bbb33
commit 1dbc0972ab
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -19,6 +19,7 @@ Red Panda C++ Version 2.4
- fix: Layout for project options dialog's general page is not correct. - fix: Layout for project options dialog's general page is not correct.
- fix: modifitions in the project options dialogs's dll host page is not correctly saved. - fix: modifitions in the project options dialogs's dll host page is not correctly saved.
- enhancement: In the project options dialog, autoset the default folder in the openning dialog when choosing file/directory paths. - enhancement: In the project options dialog, autoset the default folder in the openning dialog when choosing file/directory paths.
- fix: Escape suquences like \uxxxx and \Uxxxxxxxx in strings are not correctly highlighted.
Red Panda C++ Version 2.3 Red Panda C++ Version 2.3

2
RedPandaIDE/editor.cpp
View File

@ -783,9 +783,7 @@ void Editor::keyPressEvent(QKeyEvent *event)
return; return;
} }
} }
qDebug()<<"lalalala";
lastWord = getPreviousWordAtPositionForCompleteFunctionDefinition(caretXY()); lastWord = getPreviousWordAtPositionForCompleteFunctionDefinition(caretXY());
qDebug()<<lastWord;
if (!lastWord.isEmpty()) { if (!lastWord.isEmpty()) {
PStatement currentScope = mParser->findScopeStatement(mFilename,caretY()); PStatement currentScope = mParser->findScopeStatement(mFilename,caretY());
while(currentScope && currentScope->kind==StatementKind::skBlock) { while(currentScope && currentScope->kind==StatementKind::skBlock) {

12
libs/qsynedit/qsynedit/highlighter/cpp.cpp
View File

@ -1174,7 +1174,11 @@ void CppHighlighter::stringEscapeSeqProc()
case 'u': case 'u':
mRun+=1; mRun+=1;
for (int i=0;i<4;i++) { for (int i=0;i<4;i++) {
if (mRun>=mLineSize || mLine[mRun]<'0' || mLine[mRun]>'7') { if (mRun>=mLineSize || !(
(mLine[mRun]>='0' && mLine[mRun]<='9')
|| (mLine[mRun]>='a' && mLine[mRun]<='f')
|| (mLine[mRun]>='A' && mLine[mRun]<='F')
)) {
mTokenId = TokenId::Unknown; mTokenId = TokenId::Unknown;
return; return;
} }
@ -1184,7 +1188,11 @@ void CppHighlighter::stringEscapeSeqProc()
case 'U': case 'U':
mRun+=1; mRun+=1;
for (int i=0;i<8;i++) { for (int i=0;i<8;i++) {
if (mRun>=mLineSize || mLine[mRun]<'0' || mLine[mRun]>'7') { if (mRun>=mLineSize || !(
(mLine[mRun]>='0' && mLine[mRun]<='9')
|| (mLine[mRun]>='a' && mLine[mRun]<='f')
|| (mLine[mRun]>='A' && mLine[mRun]<='F')
)) {
mTokenId = TokenId::Unknown; mTokenId = TokenId::Unknown;
return; return;
} }