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

- enhancement: Code folding for #if/#endif 

- enhancement: When folding "if", don't fold "else";
This commit is contained in:
Roy Qu 2023-02-10 22:27:36 +08:00
parent 6b4bfc3e64
commit 7b52eff40d
8 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -2,6 +2,8 @@ Red Panda C++ Version 2.12
- fix: Can't correctly load project's custom compile options, if it contains more than one line contents.
- fix: Crash when create or open txt files in project.
- enhancement: Code folding for #if/#endif
- enhancement: When folding "if", don't fold "else";
Red Panda C++ Version 2.11

1
RedPandaIDE/editor.cpp
View File

@ -4797,6 +4797,7 @@ void Editor::checkSyntaxInBack()
pMainWindow->checkSyntaxInBack(this);
}
const PCppParser &Editor::parser() const
{
return mParser;

10
libs/qsynedit/qsynedit/painter.cpp
View File

@ -195,10 +195,10 @@ void QSynEditPainter::paintGutter(const QRect& clip)
rcFold.top() + rcFold.height() / 2);
}
// Any fold ranges beginning on this line?
PCodeFoldingRange FoldRange = edit->foldStartAtLine(vLine);
if (FoldRange) {
PCodeFoldingRange foldRange = edit->foldStartAtLine(vLine);
if (foldRange) {
// Draw the bottom part of a line
if (!FoldRange->collapsed) {
if (!foldRange->collapsed) {
x = rcFold.left() + (rcFold.width() / 2);
painter->drawLine(x, rcFold.top() + rcFold.height() / 2,
x, rcFold.bottom());
@ -220,7 +220,7 @@ void QSynEditPainter::paintGutter(const QRect& clip)
rcFold.left() + 2, rcFold.top() + (rcFold.height() / 2 ),
rcFold.right() - 2, rcFold.top() + (rcFold.height() / 2 ));
// Paint vertical line of plus sign
if (FoldRange->collapsed) {
if (foldRange->collapsed) {
x = rcFold.left() + (rcFold.width() / 2);
painter->drawLine(x, rcFold.top() + 2,
x, rcFold.bottom() - 2);
@ -1047,7 +1047,7 @@ void QSynEditPainter::paintLines()
// Paint folding
foldRange = edit->foldStartAtLine(vLine);
if ((foldRange) && foldRange->collapsed) {
sFold = edit->syntaxer()->foldString();
sFold = edit->syntaxer()->foldString("");
nFold = edit->stringColumns(sFold,edit->mDocument->lineColumns(vLine-1));
attr = edit->mSyntaxer->symbolAttribute();
getBraceColorAttr(edit->mSyntaxer->getState().braceLevel,attr);

23
libs/qsynedit/qsynedit/qsynedit.cpp
View File

@ -349,7 +349,7 @@ int QSynEdit::maxScrollWidth() const
{
int maxLen = mDocument->lengthOfLongestLine();
if (syntaxer())
maxLen = maxLen+stringColumns(syntaxer()->foldString(),maxLen);
maxLen = maxLen+stringColumns(syntaxer()->foldString(""),maxLen);
if (mOptions.testFlag(eoScrollPastEol))
return std::max(maxLen ,1);
else
@ -1921,7 +1921,7 @@ QString QSynEdit::getDisplayStringAtLine(int line) const
QString s = mDocument->getLine(line-1);
PCodeFoldingRange foldRange = foldStartAtLine(line);
if ((foldRange) && foldRange->collapsed) {
return s+syntaxer()->foldString();
return s+syntaxer()->foldString("");
}
return s;
}
@ -2332,7 +2332,7 @@ void QSynEdit::insertLine(bool moveCaret)
if (mCaretX>lineText().length()+1) {
PCodeFoldingRange foldRange = foldStartAtLine(mCaretY);
if ((foldRange) && foldRange->collapsed) {
QString s = Temp+syntaxer()->foldString();
QString s = Temp+syntaxer()->foldString("");
if (mCaretX > s.length()) {
if (!mUndoing) {
addCaretToUndo();
@ -3575,7 +3575,10 @@ void QSynEdit::findSubFoldRange(PCodeFoldingRanges topFoldRanges, PCodeFoldingRa
for (int i=0; i<mDocument->blockEnded(line);i++) {
// Stop the recursion if we find a closing char, and return to our parent
if (parent) {
parent->toLine = line + 1;
if (mDocument->blockStarted(line)>0)
parent->toLine = line;
else
parent->toLine = line + 1;
parent = parent->parent.lock();
if (!parent) {
parentFoldRanges = topFoldRanges;
@ -4547,7 +4550,7 @@ QString QSynEdit::selText() const
PCodeFoldingRange foldRange = foldStartAtLine(blockEnd().line);
QString s = mDocument->getLine(Last);
if ((foldRange) && foldRange->collapsed && ColTo>s.length()) {
s=s+syntaxer()->foldString();
s=s+syntaxer()->foldString("");
if (ColTo>s.length()) {
Last = foldRange->toLine-1;
ColTo = mDocument->getLine(Last).length()+1;
@ -4626,7 +4629,7 @@ QStringList QSynEdit::getContent(BufferCoord startPos, BufferCoord endPos, Selec
PCodeFoldingRange foldRange = foldStartAtLine(endPos.line);
QString s = mDocument->getLine(Last);
if ((foldRange) && foldRange->collapsed && ColTo>s.length()) {
s=s+syntaxer()->foldString();
s=s+syntaxer()->foldString("");
if (ColTo>s.length()) {
Last = foldRange->toLine-1;
ColTo = mDocument->getLine(Last).length()+1;
@ -4701,7 +4704,7 @@ QString QSynEdit::displayLineText()
QString s= mDocument->getLine(mCaretY - 1);
PCodeFoldingRange foldRange = foldStartAtLine(mCaretY);
if ((foldRange) && foldRange->collapsed) {
return s+syntaxer()->foldString();
return s+syntaxer()->foldString("");
}
return s;
}
@ -5293,7 +5296,7 @@ void QSynEdit::doDeleteText(BufferCoord startPos, BufferCoord endPos, SelectionM
PCodeFoldingRange foldRange = foldStartAtLine(endPos.line);
QString s = mDocument->getLine(endPos.line-1);
if ((foldRange) && foldRange->collapsed && endPos.ch>s.length()) {
QString newS=s+syntaxer()->foldString();
QString newS=s+syntaxer()->foldString("");
if ((startPos.ch<=s.length() || startPos.line<endPos.line)
&& endPos.ch>newS.length() ) {
//selection has whole block
@ -6690,7 +6693,7 @@ void QSynEdit::setBlockEnd(BufferCoord value)
} else {
int maxLen = mDocument->lengthOfLongestLine();
if (syntaxer())
maxLen = maxLen+stringColumns(syntaxer()->foldString(),maxLen);
maxLen = maxLen+stringColumns(syntaxer()->foldString(""),maxLen);
value.ch = minMax(value.ch, 1, maxLen+1);
}
if (value.ch != mBlockEnd.ch || value.line != mBlockEnd.line) {
@ -6798,7 +6801,7 @@ void QSynEdit::setBlockBegin(BufferCoord value)
} else {
int maxLen = mDocument->lengthOfLongestLine();
if (syntaxer())
maxLen = maxLen+stringColumns(syntaxer()->foldString(),maxLen);
maxLen = maxLen+stringColumns(syntaxer()->foldString(""),maxLen);
value.ch = minMax(value.ch, 1, maxLen+1);
}
if (selAvail()) {

30
libs/qsynedit/qsynedit/syntaxer/cpp.cpp
View File

@ -373,7 +373,8 @@ void CppSyntaxer::braceCloseProc()
mTokenId = TokenId::Symbol;
if (mRange.state == RangeState::rsAsmBlock) {
mRange.state = rsUnknown;
}
} else if (mRange.state == RangeState::rsDefineRemaining)
return;
mRange.braceLevel -= 1;
mRange.blockLevel -= 1;
@ -396,7 +397,9 @@ void CppSyntaxer::braceOpenProc()
if (mRange.state == RangeState::rsAsm) {
mRange.state = RangeState::rsAsmBlock;
mAsmStart = true;
}
} else if (mRange.state == RangeState::rsDefineRemaining)
return;
mRange.braceLevel += 1;
mRange.blockLevel += 1;
mRange.blockStarted++;
@ -451,8 +454,25 @@ void CppSyntaxer::directiveProc()
}
if (directive == "define") {
mRange.state = RangeState::rsDefineIdentifier;
} else
} else {
mRange.state = RangeState::rsUnknown;
if (directive=="if"
|| directive=="ifdef"
|| directive=="ifndef"
) {
mRange.blockLevel++;
mRange.blockStarted=1;
} else if (directive=="else"
|| directive=="elif"
|| directive=="elifdef"
|| directive=="elifndef") {
mRange.blockStarted=1;
mRange.blockEnded=1;
} else if (directive=="endif") {
mRange.blockLevel--;
mRange.blockEnded=1;
}
}
}
void CppSyntaxer::defineIdentProc()
@ -1638,8 +1658,10 @@ QSet<QString> CppSyntaxer::keywords() const
return set;
}
QString CppSyntaxer::foldString()
QString CppSyntaxer::foldString(QString endLine)
{
if (endLine.trimmed().startsWith("#"))
return "...";
return "...}";
}

2
libs/qsynedit/qsynedit/syntaxer/cpp.h
View File

@ -201,7 +201,7 @@ public:
// SynHighlighter interface
public:
QString foldString() override;
QString foldString(QString startLine) override;
const QSet<QString> &customTypeKeywords() const;
void setCustomTypeKeywords(const QSet<QString> &newCustomTypeKeywords);

2
libs/qsynedit/qsynedit/syntaxer/syntaxer.cpp
View File

@ -98,7 +98,7 @@ QSet<QString> Syntaxer::keywords() const
return QSet<QString>();
}
QString Syntaxer::foldString()
QString Syntaxer::foldString(QString startLine)
{
return " ... }";
}

2
libs/qsynedit/qsynedit/syntaxer/syntaxer.h
View File

@ -173,7 +173,7 @@ public:
virtual QString languageName() = 0;
virtual ProgrammingLanguage language() = 0;
virtual QString foldString();
virtual QString foldString(QString startLine);
virtual bool supportBraceLevel();
virtual bool isSpaceChar(const QChar& ch);