feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++ indenter: Ensure indent and padding are non-negative.

Browse Source 
Reviewed-by: Roberto Raggi
This commit is contained in:
Christian Kamm
2010-10-25 13:29:50 +02:00
parent de187cb6fc
commit 6f19835fd8
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cpptools/cppcodeformatter.cpp
View File

@@ -1247,6 +1247,12 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
*indentDepth = m_indentSize; *indentDepth = m_indentSize;
break; break;
} }
// ensure padding and indent are >= 0
*indentDepth = qMax(0, *indentDepth);
*savedIndentDepth = qMax(0, *savedIndentDepth);
*paddingDepth = qMax(0, *paddingDepth);
*savedPaddingDepth = qMax(0, *savedPaddingDepth);
} }
void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, int lexerState, int *indentDepth, int *paddingDepth) const void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, int lexerState, int *indentDepth, int *paddingDepth) const
@@ -1287,7 +1293,10 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
if (topState.type == expression && previousState.type == declaration_start) { if (topState.type == expression && previousState.type == declaration_start) {
*paddingDepth = m_indentSize; *paddingDepth = m_indentSize;
} else if (topState.type == ternary_op) { } else if (topState.type == ternary_op) {
if (*paddingDepth >= 2)
*paddingDepth -= 2; *paddingDepth -= 2;
else
*paddingDepth = 0;
} }
break; break;
case T_LBRACE: { case T_LBRACE: {
@@ -1382,8 +1391,12 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
break; break;
case T_LESS_LESS: case T_LESS_LESS:
case T_GREATER_GREATER: case T_GREATER_GREATER:
if (topState.type == stream_op || topState.type == stream_op_cont) if (topState.type == stream_op || topState.type == stream_op_cont) {
if (*paddingDepth >= 3)
*paddingDepth -= 3; // to align << with << *paddingDepth -= 3; // to align << with <<
else
*paddingDepth = 0;
}
break; break;
case T_COMMENT: case T_COMMENT:
case T_DOXY_COMMENT: case T_DOXY_COMMENT:
@@ -1395,7 +1408,10 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
&& (kind == T_COMMENT || kind == T_DOXY_COMMENT) && (kind == T_COMMENT || kind == T_DOXY_COMMENT)
&& (lexerState == Lexer::State_Default && (lexerState == Lexer::State_Default
|| tokens.size() != 1)) { || tokens.size() != 1)) {
if (*indentDepth >= m_indentSize)
*indentDepth -= m_indentSize; *indentDepth -= m_indentSize;
else
*indentDepth = 0;
} }
break; break;
} }