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

C++ indenter: Simplify debugging by making dump() more verbose.

Browse Source
This commit is contained in:
Christian Kamm
2010-09-24 15:07:42 +02:00
parent 0420f91c12
commit be563abf68
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/cpptools/cppcodeformatter.cpp
+4 -1
View File
@@ -36,6 +36,7 @@
#include <texteditor/tabsettings.h> #include <texteditor/tabsettings.h>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QMetaEnum>
#include <QtGui/QTextDocument> #include <QtGui/QTextDocument>
#include <QtGui/QTextCursor> #include <QtGui/QTextCursor>
#include <QtGui/QTextBlock> #include <QtGui/QTextBlock>
@@ -907,10 +908,12 @@ int CodeFormatter::tokenizeBlock(const QTextBlock &block, bool *endedJoined)
void CodeFormatter::dump() const void CodeFormatter::dump() const
{ {
QMetaEnum metaEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("StateType"));
qDebug() << "Current token index" << m_tokenIndex; qDebug() << "Current token index" << m_tokenIndex;
qDebug() << "Current state:"; qDebug() << "Current state:";
foreach (State s, m_currentState) { foreach (State s, m_currentState) {
qDebug() << s.type << s.savedIndentDepth << s.savedPaddingDepth; qDebug() << metaEnum.valueToKey(s.type) << s.savedIndentDepth << s.savedPaddingDepth;
} }
qDebug() << "Current indent depth:" << m_indentDepth; qDebug() << "Current indent depth:" << m_indentDepth;
qDebug() << "Current padding depth:" << m_paddingDepth; qDebug() << "Current padding depth:" << m_paddingDepth;
src/plugins/cpptools/cppcodeformatter.h
+4 -1
View File
@@ -57,6 +57,7 @@ class CppCodeFormatterData;
class CPPTOOLS_EXPORT CodeFormatter class CPPTOOLS_EXPORT CodeFormatter
{ {
Q_GADGET
public: public:
CodeFormatter(); CodeFormatter();
virtual ~CodeFormatter(); virtual ~CodeFormatter();
@@ -98,7 +99,7 @@ protected:
virtual void saveLexerState(QTextBlock *block, int state) const = 0; virtual void saveLexerState(QTextBlock *block, int state) const = 0;
virtual int loadLexerState(const QTextBlock &block) const = 0; virtual int loadLexerState(const QTextBlock &block) const = 0;
protected: public: // must be public to make Q_GADGET introspection work
enum StateType { enum StateType {
invalid = 0, invalid = 0,
@@ -170,7 +171,9 @@ protected:
expression, // after a '=' in a declaration_start once we're sure it's not '= {' expression, // after a '=' in a declaration_start once we're sure it's not '= {'
initializer, // after a '=' in a declaration start initializer, // after a '=' in a declaration start
}; };
Q_ENUMS(StateType)
protected:
class State { class State {
public: public:
State() State()
tests/auto/cplusplus/codeformatter/codeformatter.pro
+1
View File
@@ -12,6 +12,7 @@ SOURCES += \
$$SRCDIR/plugins/texteditor/basetextdocumentlayout.cpp $$SRCDIR/plugins/texteditor/basetextdocumentlayout.cpp
HEADERS += \ HEADERS += \
$$SRCDIR/plugins/cpptools/cppcodeformatter.h \
$$SRCDIR/plugins/texteditor/basetextdocumentlayout.h $$SRCDIR/plugins/texteditor/basetextdocumentlayout.h
INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs