diff options
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index dc81915227..c8ba07fbe0 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -635,7 +635,6 @@ void CodeFormatter::updateStateUntil(const QTextBlock &endBlock) break; if (loadLexerState(it) == -1) break; - previousState = blockData.m_endState; } @@ -673,6 +672,16 @@ void CodeFormatter::updateLineStateChange(const QTextBlock &block) saveBlockData(&next, BlockData()); } +bool CodeFormatter::isInStringLiteral(const QTextBlock &block) const +{ + if (!block.previous().isValid()) + return false; + BlockData blockData; + if (!loadBlockData(block.previous(), &blockData)) + return false; + return !blockData.m_endState.isEmpty() && blockData.m_endState.top().type == string_open; +} + CodeFormatter::State CodeFormatter::state(int belowTop) const { if (belowTop < m_currentState.size()) |