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

* unindent when input public: / private: / protected:

This commit is contained in:
royqh1979@gmail.com 2021-10-29 21:22:41 +08:00
parent 75cb4c9b5a
commit f9cefaf196
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RedPandaIDE/editor.cpp
View File

@ -1903,7 +1903,8 @@ bool Editor::handleCodeCompletion(QChar key)
showCompletion(false); showCompletion(false);
return true; return true;
case ':': case ':':
setSelText(key); ExecuteCommand(SynEditorCommand::ecChar,':',nullptr);
//setSelText(key);
if ((caretX() > 2) && (lineText().length() >= 2) && if ((caretX() > 2) && (lineText().length() >= 2) &&
(lineText()[caretX() - 3] == ':')) (lineText()[caretX() - 3] == ':'))
showCompletion(false); showCompletion(false);

35
RedPandaIDE/qsynedit/SynEdit.cpp
View File

@ -1424,11 +1424,19 @@ int SynEdit::calcIndentSpaces(int line, const QString& lineText, bool addIndent)
mHighlighter->setState(rangePreceeding); mHighlighter->setState(rangePreceeding);
mHighlighter->setLine(lineText.trimmed(),line-1); mHighlighter->setLine(lineText.trimmed(),line-1);
SynRangeState rangeAfterFirstToken = mHighlighter->getRangeState(); SynRangeState rangeAfterFirstToken = mHighlighter->getRangeState();
QString firstToken = mHighlighter->getToken();
PSynHighlighterAttribute attr = mHighlighter->getTokenAttribute();
if (rangeAfterFirstToken.indents.length() < rangePreceeding.indents.length()) { if (rangeAfterFirstToken.indents.length() < rangePreceeding.indents.length()) {
indentSpaces -= mTabWidth; indentSpaces -= mTabWidth;
} else if (rangeAfterFirstToken.getLastIndent() == BraceIndentType } else if (rangeAfterFirstToken.getLastIndent() == BraceIndentType
&& rangePreceeding.getLastIndent() == StatementIndentType) { && rangePreceeding.getLastIndent() == StatementIndentType) {
indentSpaces -= mTabWidth; indentSpaces -= mTabWidth;
} else if (attr == mHighlighter->keywordAttribute()
&& lineText.endsWith(':')
&& (
firstToken == "public" || firstToken == "private"
|| firstToken == "protected" || firstToken == "case")) {
indentSpaces -= mTabWidth;
} }
} }
} }
@ -2480,6 +2488,33 @@ void SynEdit::doAddChar(QChar AChar)
mUndoList->BeginBlock(); mUndoList->BeginBlock();
if (mOptions.testFlag(eoAutoIndent) && mHighlighter if (mOptions.testFlag(eoAutoIndent) && mHighlighter
&& (oldCaretY<=mLines->count())) { && (oldCaretY<=mLines->count())) {
//unindent if ':' at end of the line
if (AChar == ':') {
QString line = mLines->getString(oldCaretY-1);
if (line.length() < oldCaretX) {
int indentSpaces = calcIndentSpaces(oldCaretY,line+":", true);
if (indentSpaces != leftSpaces(line)) {
QString temp = GetLeftSpacing(indentSpaces,true) + TrimLeft(line);
int i = temp.length();
mLines->putString(oldCaretY-1,temp);
internalSetCaretXY(BufferCoord{i+1,oldCaretY});
mUndoList->AddChange(
SynChangeReason::crDelete,
BufferCoord{1, oldCaretY},
BufferCoord{line.length()+1, oldCaretY},
line,
SynSelectionMode::smNormal
);
mUndoList->AddChange(
SynChangeReason::crInsert,
BufferCoord{1, oldCaretY},
BufferCoord{temp.length()+1, oldCaretY},
"",
SynSelectionMode::smNormal
);
}
}
}
//unindent if '{' is after an statement like 'if' 'for' //unindent if '{' is after an statement like 'if' 'for'
if (AChar == '{') { if (AChar == '{') {
QString temp = mLines->getString(oldCaretY-1).mid(0,oldCaretX-1); QString temp = mLines->getString(oldCaretY-1).mid(0,oldCaretX-1);